From e88b0e6e1bd947fdacfccf5ece95b9f68ef59c06 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 26 May 2023 10:58:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/extension/captcha/CaptchaTokenGranter.java | 7 +++++-- .../com/njcn/common/pojo/constant/SecurityConstants.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pqs-auth/src/main/java/com/njcn/auth/security/extension/captcha/CaptchaTokenGranter.java b/pqs-auth/src/main/java/com/njcn/auth/security/extension/captcha/CaptchaTokenGranter.java index 023b3bc1c..5abe29f8a 100644 --- a/pqs-auth/src/main/java/com/njcn/auth/security/extension/captcha/CaptchaTokenGranter.java +++ b/pqs-auth/src/main/java/com/njcn/auth/security/extension/captcha/CaptchaTokenGranter.java @@ -48,8 +48,11 @@ public class CaptchaTokenGranter extends AbstractTokenGranter { Map parameters = new LinkedHashMap<>(tokenRequest.getRequestParameters()); String username = parameters.get(SecurityConstants.USERNAME); username = DesUtils.aesDecrypt(username); - if (!judgeImageCode(parameters.get(SecurityConstants.IMAGE_CODE), RequestUtil.getRequest())) { - throw new BusinessException(UserResponseEnum.LOGIN_WRONG_CODE); + String verifyCode = parameters.get(SecurityConstants.VERIFY_CODE); + if(StrUtil.isEmpty(verifyCode)||verifyCode.equals("1")){ + if (!judgeImageCode(parameters.get(SecurityConstants.IMAGE_CODE), RequestUtil.getRequest())) { + throw new BusinessException(UserResponseEnum.LOGIN_WRONG_CODE); + } } String password = parameters.get(SecurityConstants.PASSWORD); String ip = RequestUtil.getRequest().getHeader(SecurityConstants.REQUEST_HEADER_KEY_CLIENT_REAL_IP); diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/SecurityConstants.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/SecurityConstants.java index 5ab308c66..cee58637b 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/SecurityConstants.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/SecurityConstants.java @@ -95,6 +95,7 @@ public interface SecurityConstants { String USERNAME = "username"; String PASSWORD = "password"; String IMAGE_CODE = "imageCode"; + String VERIFY_CODE = "verifyCode"; /**