用户登录问题修改

This commit is contained in:
jiang 2024-09-10 18:08:39 +08:00
parent a1ea5b8077
commit 2f705bc955
1 changed files with 6 additions and 4 deletions

View File

@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicReference;
public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> { public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> {
private final static String[] VALIDATE_URL = new String[]{"/auth/login", "/auth/register", "/auth/getPhoneCode"}; private final static String[] VALIDATE_URL = new String[]{"/auth/login", "/auth/register", "/auth/getPhoneCode"};
@Autowired @Autowired
private ValidateCodeService validateCodeService; private ValidateCodeService validateCodeService;
@ -47,7 +46,7 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> {
ServerHttpRequest request = exchange.getRequest(); ServerHttpRequest request = exchange.getRequest();
// 非登录/注册请求或验证码关闭不处理 // 非登录/注册请求或验证码关闭不处理
if (!StringUtils.equalsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL) || !captchaProperties.getEnabled()) { if (!StringUtils.equalsAnyIgnoreCase(request.getURI().getPath(), VALIDATE_URL)) {
return chain.filter(exchange); return chain.filter(exchange);
} }
try { try {
@ -56,9 +55,12 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> {
throw new CaptchaException("请求参数异常"); throw new CaptchaException("请求参数异常");
} }
JSONObject obj = JSON.parseObject(rspStr); JSONObject obj = JSON.parseObject(rspStr);
if (ObjectUtils.isNotEmpty(obj) && ObjectUtils.isNotEmpty(obj.getString("loginType")) && StringUtils.equals(obj.getString("loginType"), "mobile")) { if (ObjectUtils.isNotEmpty(obj) && ObjectUtils.isNotEmpty(obj.getString("phoneUuid")) && ObjectUtils.isNotEmpty(obj.getString("verificationCode"))) {
validateCodeService.checkPhoneCaptcha(obj.getString("verificationCode"), obj.getString("mobile")); validateCodeService.checkPhoneCaptcha(obj.getString("verificationCode"), obj.getString("phoneUuid"));
} else { } else {
if (!captchaProperties.getEnabled()) {
return chain.filter(exchange);
}
validateCodeService.checkCaptcha(obj.getString(CODE), obj.getString(UUID)); validateCodeService.checkCaptcha(obj.getString(CODE), obj.getString(UUID));
} }