zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 解决 e 办密码登录时，没有跳过验证码登录的错误

Browse Source
This commit is contained in:
chenbowen
2025-08-19 15:08:19 +08:00
parent 07c9ead358
commit e034254b89
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/SyncController.java
View File

@@ -275,6 +275,7 @@ public class SyncController {
AuthLoginReqVO authLoginReqVO = new AuthLoginReqVO(); AuthLoginReqVO authLoginReqVO = new AuthLoginReqVO();
authLoginReqVO.setUsername((String) map.getOrDefault("bimRemoteUser", "")); authLoginReqVO.setUsername((String) map.getOrDefault("bimRemoteUser", ""));
authLoginReqVO.setPassword((String) map.getOrDefault("bimRemotePwd", "")); authLoginReqVO.setPassword((String) map.getOrDefault("bimRemotePwd", ""));
authLoginReqVO.setCaptchaVerification(encryptKey);
AuthLoginRespVO login = adminAuthService.login(authLoginReqVO); AuthLoginRespVO login = adminAuthService.login(authLoginReqVO);
// 校验访问令牌 // 校验访问令牌

7
yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
View File

@@ -32,6 +32,7 @@ import jakarta.annotation.Resource;
import jakarta.validation.Validator; import jakarta.validation.Validator;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -67,6 +68,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
private CaptchaService captchaService; private CaptchaService captchaService;
@Resource @Resource
private SmsCodeApi smsCodeApi; private SmsCodeApi smsCodeApi;
@Value("${sync.encrypt-key}")
private String encryptKey;
/** /**
* 验证码的开关，默认为 true * 验证码的开关，默认为 true
@@ -200,6 +203,10 @@ public class AdminAuthServiceImpl implements AdminAuthService {
if (!captchaEnable) { if (!captchaEnable) {
return ResponseModel.success(); return ResponseModel.success();
} }
// 如果 encryptKey 不为空并且与 reqVO 的验证码一致，则直接返回成功
if (StringUtils.isNotBlank(encryptKey) && StringUtils.equals(reqVO.getCaptchaVerification(), encryptKey)) {
return ResponseModel.success();
}
ValidationUtils.validate(validator, reqVO, CaptchaVerificationReqVO.CodeEnableGroup.class); ValidationUtils.validate(validator, reqVO, CaptchaVerificationReqVO.CodeEnableGroup.class);
CaptchaVO captchaVO = new CaptchaVO(); CaptchaVO captchaVO = new CaptchaVO();
captchaVO.setCaptchaVerification(reqVO.getCaptchaVerification()); captchaVO.setCaptchaVerification(reqVO.getCaptchaVerification());