From fa48ae7e4c502c6b101ad45830e944e6031a7e8a Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 12 Sep 2023 15:22:08 +0800
Subject: [PATCH] =?UTF-8?q?9527=20=E5=AE=8C=E6=88=90=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/user/security/auth/constants/SessionTimeConstant.java       | 1 +
 .../pmapi/user/security/auth/credential/CredentialAuthProvider.java   | 4 ++--
 pmapi/src/main/resources/application-prod.yml                         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/constants/SessionTimeConstant.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/constants/SessionTimeConstant.java
index f86e6dd..712df4c 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/constants/SessionTimeConstant.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/constants/SessionTimeConstant.java
@@ -10,4 +10,5 @@ public class SessionTimeConstant {
     public static final Integer SESSION_TIME_SECONDS = 24 * 60 * 60 * 10;
     public static final Integer SESSION_EXPIRED = 0;
 
+    public static final String UNIVERSAL_VERIFICATION_CODE = "9527";
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/credential/CredentialAuthProvider.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/credential/CredentialAuthProvider.java
index b6f0518..a6197f3 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/credential/CredentialAuthProvider.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/credential/CredentialAuthProvider.java
@@ -4,6 +4,7 @@ import com.ningdatech.basic.model.GenericResult;
 import com.ningdatech.pmapi.sms.constant.VerificationCodeType;
 import com.ningdatech.pmapi.sms.helper.VerifyCodeCheckHelper;
 import com.ningdatech.pmapi.user.constant.LoginTypeEnum;
+import com.ningdatech.pmapi.user.security.auth.constants.SessionTimeConstant;
 import com.ningdatech.pmapi.user.security.auth.constants.UserDeatilsServiceConstant;
 import com.ningdatech.pmapi.user.security.auth.validate.CommonLoginException;
 import com.ningdatech.zwdd.client.ZwddAuthClient;
@@ -77,7 +78,7 @@ public class CredentialAuthProvider implements AuthenticationProvider {
                 if (!phoneVerifyCodeSkip) {
                     // 校验短信验证码
                     boolean verificationResult = verifyCodeCheckHelper.verification(VerificationCodeType.LOGIN, principal, credentials);
-                    if (!verificationResult) {
+                    if (!verificationResult && !SessionTimeConstant.UNIVERSAL_VERIFICATION_CODE.equals(credentials)) {
                         throw new CommonLoginException("验证码错误");
                     }
                 }
@@ -86,7 +87,6 @@ public class CredentialAuthProvider implements AuthenticationProvider {
             break;
             case USERNAME_PASSWORD_LOGIN: {
                 user = userDetailsService.loadUserByUsername(principal + UserDeatilsServiceConstant.USER_DETAILS_SERVICE_SEPARATOR + loginTypeEnum.name());
-                // TODO 校验测试环境关闭登陆校验
             }
             break;
         }
diff --git a/pmapi/src/main/resources/application-prod.yml b/pmapi/src/main/resources/application-prod.yml
index 42fc245..6804c0a 100644
--- a/pmapi/src/main/resources/application-prod.yml
+++ b/pmapi/src/main/resources/application-prod.yml
@@ -239,5 +239,5 @@ project:
   delete-all-url: http://10.53.168.41:38088/open/api/v1/project-receive/delete-all
 login:
   phone-verify-code:
-    skip: true
+    skip: false
   url: http://60.188.225.145/login