sz-team/supervision-test-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!35 czh-20260608-删除登录验证码功能

Browse Source 
Merge pull request !35 from 陈志浩/feature/login
This commit is contained in:
陈志浩
2026-06-08 07:38:19 +00:00
committed by Gitee
parent fc69f25260 1c77a07c59
commit 751254e7ac
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+22 -21
View File
@@ -80,26 +80,25 @@ public class LoginController {
return result.error500("该用户登录失败次数过多，请于10分钟后再次登录！"); return result.error500("该用户登录失败次数过多，请于10分钟后再次登录！");
} }
// step.1 验证码check // step.1 验证码check（前端已隐藏验证码，后台兼容跳过校验）
String captcha = sysLoginModel.getCaptcha(); String captcha = sysLoginModel.getCaptcha();
if(captcha==null){ String realKey = null;
result.error500("验证码无效"); if (oConvertUtils.isNotEmpty(captcha)) {
return result; String lowerCaseCaptcha = captcha.toLowerCase();
} // 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可
String lowerCaseCaptcha = captcha.toLowerCase(); //update-begin---author:chenrui ---date:20250107 for：[QQYUN-10775]验证码可以复用 #7674------------
// 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可 String keyPrefix = Md5Util.md5Encode(sysLoginModel.getCheckKey()+jeecgBaseConfig.getSignatureSecret(), "utf-8");
//update-begin---author:chenrui ---date:20250107 for：[QQYUN-10775]验证码可以复用 #7674------------ realKey = keyPrefix + lowerCaseCaptcha;
String keyPrefix = Md5Util.md5Encode(sysLoginModel.getCheckKey()+jeecgBaseConfig.getSignatureSecret(), "utf-8"); //update-end---author:chenrui ---date:20250107 for：[QQYUN-10775]验证码可以复用 #7674------------
String realKey = keyPrefix + lowerCaseCaptcha; Object checkCode = redisUtil.get(realKey);
//update-end---author:chenrui ---date:20250107 for：[QQYUN-10775]验证码可以复用 #7674------------ //当进入登录页时，有一定几率出现验证码错误 #1714
Object checkCode = redisUtil.get(realKey); if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
//当进入登录页时，有一定几率出现验证码错误 #1714 log.warn("验证码错误，key= {} , Ui checkCode= {}, Redis checkCode = {}", sysLoginModel.getCheckKey(), lowerCaseCaptcha, checkCode);
if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) { result.error500("验证码错误");
log.warn("验证码错误，key= {} , Ui checkCode= {}, Redis checkCode = {}", sysLoginModel.getCheckKey(), lowerCaseCaptcha, checkCode); // 改成特殊的code 便于前端判断
result.error500("验证码错误"); result.setCode(HttpStatus.PRECONDITION_FAILED.value());
// 改成特殊的code 便于前端判断 return result;
result.setCode(HttpStatus.PRECONDITION_FAILED.value()); }
return result;
} }
// step.2 校验用户是否存在且有效 // step.2 校验用户是否存在且有效
@@ -124,7 +123,9 @@ public class LoginController {
userInfo(sysUser, result, request); userInfo(sysUser, result, request);
// step.5 登录成功删除验证码 // step.5 登录成功删除验证码
redisUtil.del(realKey); if (oConvertUtils.isNotEmpty(realKey)) {
redisUtil.del(realKey);
}
redisUtil.del(CommonConstant.LOGIN_FAIL + username); redisUtil.del(CommonConstant.LOGIN_FAIL + username);
// step.6 记录用户登录日志 // step.6 记录用户登录日志