wms / wms4_hunanhongwang · Commits

Commit ca2b6102c508bcf78abf277035322b5c36e6bfbc

Authored by 肖超群
1 parent c4af3466

优化登录界面

Inline Side-by-side
Showing 3 changed files with 43 additions and 44 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/views/user/Login.vue
  View file @ca2b610
... ... @@ -11,7 +11,7 @@
11 11 <!-- </a-tab-pane>-->
12 12 </a-tabs>
13 13  
14   - <a-form-model-item>
  14 +<!-- <a-form-model-item>-->
15 15 <!-- <a-checkbox @change="handleRememberMeChange" default-checked>自动登录</a-checkbox>-->
16 16 <!-- <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">-->
17 17 <!-- 忘记密码-->
... ... @@ -19,7 +19,7 @@
19 19 <!-- <router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >-->
20 20 <!-- 注册账户-->
21 21 <!-- </router-link>-->
22   - </a-form-model-item>
  22 +<!-- </a-form-model-item>-->
23 23  
24 24 <a-form-item style="margin-top:24px">
25 25 <a-button size="large" type="primary" htmlType="submit" class="login-button" :loading="loginBtn" @click.stop.prevent="handleSubmit" :disabled="loginBtn">确定
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/user/LoginAccount.vue
  View file @ca2b610
... ... @@ -45,7 +45,7 @@
45 45 model:{
46 46 username: '',
47 47 password: '',
48   - inputCode: ''
  48 + // inputCode: ''
49 49 },
50 50 validatorRules:{
51 51 username: [
... ... @@ -55,9 +55,9 @@
55 55 password: [{
56 56 required: true, message: '请输入密码!', validator: 'click'
57 57 }],
58   - inputCode: [{
59   - required: true, message: '请输入验证码!'
60   - }]
  58 + // inputCode: [{
  59 + // required: true, message: '请输入验证码!'
  60 + // }]
61 61 }
62 62  
63 63 }
... ... @@ -70,7 +70,7 @@
70 70 /**刷新验证码*/
71 71 handleChangeCheckCode(){
72 72 this.currdatetime = new Date().getTime();
73   - this.model.inputCode = ''
  73 + // this.model.inputCode = ''
74 74 getAction(`/sys/randomImage/${this.currdatetime}`).then(res=>{
75 75 if(res.success){
76 76 this.randCodeImage = res.result
... ... @@ -123,12 +123,11 @@
123 123 },
124 124 //账号密码登录
125 125 handleLogin(rememberMe){
126   - this.validateFields([ 'username', 'password', 'inputCode' ], (err)=>{
  126 + this.validateFields([ 'username', 'password' ], (err)=>{
127 127 if(!err){
128 128 let loginParams = {
129 129 username: this.model.username,
130 130 password: this.model.password,
131   - captcha: this.model.inputCode,
132 131 checkKey: this.currdatetime,
133 132 remember_me: rememberMe,
134 133 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  View file @ca2b610
... ... @@ -71,22 +71,22 @@ public class LoginController {
71 71 //update-begin--Author:scott Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
72 72  
73 73 //update-begin-author:taoyan date:20190828 for:校验验证码
74   - String captcha = sysLoginModel.getCaptcha();
75   - if(captcha==null){
76   - result.error500("验证码无效");
77   - return result;
78   - }
79   - String lowerCaseCaptcha = captcha.toLowerCase();
80   - String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+sysLoginModel.getCheckKey(), "utf-8");
81   - Object checkCode = redisUtil.get(realKey);
82   - //当进入登录页时，有一定几率出现验证码错误 #1714
83   - if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
84   - log.warn("验证码错误，key= {} , Ui checkCode= {}, Redis checkCode = {}", sysLoginModel.getCheckKey(), lowerCaseCaptcha, checkCode);
85   - result.error500("验证码错误");
86   - return result;
87   - }
  74 +// String captcha = sysLoginModel.getCaptcha();
  75 +// if(captcha==null){
  76 +// result.error500("验证码无效");
  77 +// return result;
  78 +// }
  79 +// String lowerCaseCaptcha = captcha.toLowerCase();
  80 +// String realKey = MD5Util.MD5Encode(lowerCaseCaptcha+sysLoginModel.getCheckKey(), "utf-8");
  81 +// Object checkCode = redisUtil.get(realKey);
  82 +// //当进入登录页时，有一定几率出现验证码错误 #1714
  83 +// if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
  84 +// log.warn("验证码错误，key= {} , Ui checkCode= {}, Redis checkCode = {}", sysLoginModel.getCheckKey(), lowerCaseCaptcha, checkCode);
  85 +// result.error500("验证码错误");
  86 +// return result;
  87 +// }
88 88 //update-end-author:taoyan date:20190828 for:校验验证码
89   -
  89 +
90 90 //1. 校验用户是否有效
91 91 //update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
92 92 LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
... ... @@ -97,7 +97,7 @@ public class LoginController {
97 97 if(!result.isSuccess()) {
98 98 return result;
99 99 }
100   -
  100 +
101 101 //2. 校验用户名或密码是否正确
102 102 String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
103 103 String syspassword = sysUser.getPassword();
... ... @@ -105,11 +105,11 @@ public class LoginController {
105 105 result.error500("用户名或密码错误");
106 106 return result;
107 107 }
108   -
  108 +
109 109 //用户登录信息
110 110 userInfo(sysUser, result);
111 111 //update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
112   - redisUtil.del(realKey);
  112 +// redisUtil.del(realKey);
113 113 //update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
114 114 LoginUser loginUser = new LoginUser();
115 115 BeanUtils.copyProperties(sysUser, loginUser);
... ... @@ -141,7 +141,7 @@ public class LoginController {
141 141 return result;
142 142  
143 143 }
144   -
  144 +
145 145 /**
146 146 * 退出登录
147 147 * @param request
... ... @@ -175,7 +175,7 @@ public class LoginController {
175 175 return Result.error("Token无效!");
176 176 }
177 177 }
178   -
  178 +
179 179 /**
180 180 * 获取访问量
181 181 * @return
... ... @@ -206,7 +206,7 @@ public class LoginController {
206 206 result.success("登录成功");
207 207 return result;
208 208 }
209   -
  209 +
210 210 /**
211 211 * 获取访问量
212 212 * @return
... ... @@ -227,8 +227,8 @@ public class LoginController {
227 227 result.setResult(oConvertUtils.toLowerCasePageList(list));
228 228 return result;
229 229 }
230   -
231   -
  230 +
  231 +
232 232 /**
233 233 * 登陆成功选择用户当前部门
234 234 * @param user
... ... @@ -253,7 +253,7 @@ public class LoginController {
253 253  
254 254 /**
255 255 * 短信登录接口
256   - *
  256 + *
257 257 * @param jsonObject
258 258 * @return
259 259 */
... ... @@ -302,7 +302,7 @@ public class LoginController {
302 302 }
303 303 return result;
304 304 }
305   -
  305 +
306 306 /**
307 307 * smsmode 短信模板方式 0 .登录模板、1.注册模板、2.忘记密码模板
308 308 */
... ... @@ -334,11 +334,11 @@ public class LoginController {
334 334 }
335 335 return result;
336 336 }
337   -
  337 +
338 338  
339 339 /**
340 340 * 手机号登录接口
341   - *
  341 + *
342 342 * @param jsonObject
343 343 * @return
344 344 */
... ... @@ -347,14 +347,14 @@ public class LoginController {
347 347 public Result<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject) {
348 348 Result<JSONObject> result = new Result<JSONObject>();
349 349 String phone = jsonObject.getString("mobile");
350   -
  350 +
351 351 //校验用户有效性
352 352 SysUser sysUser = sysUserService.getUserByPhone(phone);
353 353 result = sysUserService.checkUserIsEffective(sysUser);
354 354 if(!result.isSuccess()) {
355 355 return result;
356 356 }
357   -
  357 +
358 358 String smscode = jsonObject.getString("captcha");
359 359 Object code = redisUtil.get(phone);
360 360 if (!smscode.equals(code)) {
... ... @@ -473,7 +473,7 @@ public class LoginController {
473 473 }
474 474 return res;
475 475 }
476   -
  476 +
477 477 /**
478 478 * app登录
479 479 * @param sysLoginModel
... ... @@ -485,14 +485,14 @@ public class LoginController {
485 485 Result<JSONObject> result = new Result<JSONObject>();
486 486 String username = sysLoginModel.getUsername();
487 487 String password = sysLoginModel.getPassword();
488   -
  488 +
489 489 //1. 校验用户是否有效
490 490 SysUser sysUser = sysUserService.getUserByName(username);
491 491 result = sysUserService.checkUserIsEffective(sysUser);
492 492 if(!result.isSuccess()) {
493 493 return result;
494 494 }
495   -
  495 +
496 496 //2. 校验用户名或密码是否正确
497 497 String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
498 498 String syspassword = sysUser.getPassword();
... ... @@ -500,7 +500,7 @@ public class LoginController {
500 500 result.error500("用户名或密码错误");
501 501 return result;
502 502 }
503   -
  503 +
504 504 String orgCode = sysUser.getOrgCode();
505 505 if(oConvertUtils.isEmpty(orgCode)) {
506 506 //如果当前用户无选择部门 查看部门关联信息
... ... @@ -519,7 +519,7 @@ public class LoginController {
519 519 JSONObject obj = new JSONObject();
520 520 //用户登录信息
521 521 obj.put("userInfo", sysUser);
522   -
  522 +
523 523 // 生成token
524 524 String token = JwtUtil.sign(username, syspassword);
525 525 // 设置超时时间
... ... @@ -609,4 +609,4 @@ public class LoginController {
609 609 return Result.OK(result);
610 610 }
611 611  
612   -}
613 612 \ No newline at end of file
  613 +}
... ...