From 2ccf80efbbd1a88f4c73811fd3829a92580b0c0c Mon Sep 17 00:00:00 2001
From: bubu <3357025395@qq.com>
Date: Sat, 17 May 2025 12:04:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/login/enums/AuthExceptionEnum.java     |  3 +++
 .../login/service/impl/AuthServiceImpl.java        | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthExceptionEnum.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthExceptionEnum.java
index 7753b20f..37516593 100644
--- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthExceptionEnum.java
+++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthExceptionEnum.java
@@ -29,6 +29,9 @@ public enum AuthExceptionEnum {
     /** 验证码请求号不能为空 */
     VALID_CODE_REQ_NO_EMPTY("验证码请求号不能为空"),
 
+    /** 验证码过期 */
+    VALID_CODE_EXPIRED("验证码过期"),
+
     /** 验证码错误 */
     VALID_CODE_ERROR("验证码错误"),
 
diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java
index 9ab1f3d8..7a33d078 100644
--- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java
@@ -327,11 +327,15 @@ public class AuthServiceImpl implements AuthService {
             // 手机或者邮箱验证码
             existValidCode = commonCacheOperator.get(AUTH_VALID_CODE_CACHE_KEY + phoneOrEmail + StrUtil.UNDERLINE + validCodeReqNo);
         }
-        // 为空则直接验证码错误
-        if(ObjectUtil.isEmpty(existValidCode)) {
+        // 缓存中不存在验证码则返回失效错误
+        if (ObjectUtil.isEmpty(existValidCode)){
+            throw new CommonException(AuthExceptionEnum.VALID_CODE_EXPIRED.getValue());
+        }
+        // 不一致则直接验证码错误
+        if (!validCode.equalsIgnoreCase(Convert.toStr(existValidCode))) {
             throw new CommonException(AuthExceptionEnum.VALID_CODE_ERROR.getValue());
         }
-        // 移除该验证码
+        // 验证成功，移除该验证码
         if(ObjectUtil.isEmpty(phoneOrEmail)) {
             // 图形验证码
             commonCacheOperator.remove(AUTH_VALID_CODE_CACHE_KEY + validCodeReqNo);
@@ -339,10 +343,6 @@ public class AuthServiceImpl implements AuthService {
             // 手机或者邮箱验证码
             commonCacheOperator.remove(AUTH_VALID_CODE_CACHE_KEY + phoneOrEmail + StrUtil.UNDERLINE + validCodeReqNo);
         }
-        // 不一致则直接验证码错误
-        if (!validCode.equalsIgnoreCase(Convert.toStr(existValidCode))) {
-            throw new CommonException("验证码错误");
-        }
     }
 
     /**