Commit 69ca25bb authored by 赵啸非's avatar 赵啸非

修复部分sqlXml生成缺陷

parent 8564d4cd
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
<el-form-item label="密码"> <el-form-item label="密码">
<el-input v-model="form.password" type='password'></el-input> <el-input v-model="form.password" type='password'></el-input>
</el-form-item> </el-form-item>
<el-form-item label="验证码"> <!-- <el-form-item label="验证码">
<el-input v-model="form.securityCode"> <el-input v-model="form.securityCode">
<img slot="append" width='60' height="30" :src='securityCodeUrl' @click='refreshCode'/> <img slot="append" width='60' height="30" :src='securityCodeUrl' @click='refreshCode'/>
</el-input> </el-input>
</el-form-item> </el-form-item>-->
<el-form-item size="large"> <el-form-item size="large">
<el-button type="primary" native-type='submit' :loading='loading' @click='onSubmit'>登录</el-button> <el-button type="primary" native-type='submit' :loading='loading' @click='onSubmit'>登录</el-button>
</el-form-item> </el-form-item>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<script> <script>
//import { createSocket } from '@/assets/utils/websocket' //import { createSocket } from '@/assets/utils/websocket'
const securityCodeUrl = '/m/securitycode/createCode?v='; //const securityCodeUrl = '/m/securitycode/createCode?v=';
...@@ -74,9 +74,9 @@ export default { ...@@ -74,9 +74,9 @@ export default {
if(!this.form.password.length){ if(!this.form.password.length){
return this.$message.warning('请输入密码') return this.$message.warning('请输入密码')
} }
if(!this.form.securityCode.length){ /* if(!this.form.securityCode.length){
return this.$message.warning('请输入验证码') return this.$message.warning('请输入验证码')
} }*/
this.login(); this.login();
}, },
}, },
...@@ -84,11 +84,11 @@ export default { ...@@ -84,11 +84,11 @@ export default {
return { return {
loading: false, loading: false,
redirect: this.$route.query.redirect || '/', redirect: this.$route.query.redirect || '/',
securityCodeUrl: securityCodeUrl, // securityCodeUrl: securityCodeUrl,
form: { form: {
loginName: '', loginName: '',
password: '', password: '',
securityCode: '', // securityCode: '',
} }
} }
} }
......
...@@ -65,7 +65,8 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor ...@@ -65,7 +65,8 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
JSONObject ret = new JSONObject(); JSONObject ret = new JSONObject();
String loginName = loginForm.getLoginName(); String loginName = loginForm.getLoginName();
String password = loginForm.getPassword(); String password = loginForm.getPassword();
String securityCode = loginForm.getSecurityCode(); //String securityCode = loginForm.getSecurityCode();
String securityCode = "admin";
String ip = super.getRequestIP(request); String ip = super.getRequestIP(request);
if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) { if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE); ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
......
package com.mortals.xhx.module.app.web; package com.mortals.xhx.module.app.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -10,6 +12,9 @@ import javax.servlet.http.HttpServletResponse; ...@@ -10,6 +12,9 @@ import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonMappingController; import com.mortals.framework.web.BaseCRUDJsonMappingController;
import com.mortals.xhx.module.app.model.AppEntity; import com.mortals.xhx.module.app.model.AppEntity;
import com.mortals.xhx.module.app.service.AppService; import com.mortals.xhx.module.app.service.AppService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
/** /**
* AppController * AppController
...@@ -35,4 +40,11 @@ public class AppController extends BaseCRUDJsonMappingController<AppService,AppF ...@@ -35,4 +40,11 @@ public class AppController extends BaseCRUDJsonMappingController<AppService,AppF
protected void init(HttpServletRequest request, HttpServletResponse response, AppForm form, Map<String, Object> model, Context context) { protected void init(HttpServletRequest request, HttpServletResponse response, AppForm form, Map<String, Object> model, Context context) {
super.init(request, response, form, model, context); super.init(request, response, form, model, context);
} }
@Override
protected void doListBefore(HttpServletRequest request, HttpServletResponse response, AppForm form, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(request, response, form, model, context);
form.getQuery().setOrderColList(Arrays.asList(new OrderCol("id","desc")));
}
} }
\ No newline at end of file
...@@ -40,6 +40,9 @@ public class ProjectController extends BaseCRUDJsonMappingController<ProjectServ ...@@ -40,6 +40,9 @@ public class ProjectController extends BaseCRUDJsonMappingController<ProjectServ
@Override @Override
protected void doListBefore(HttpServletRequest request, HttpServletResponse response, ProjectForm form, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(HttpServletRequest request, HttpServletResponse response, ProjectForm form, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(request, response, form, model, context); super.doListBefore(request, response, form, model, context);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment