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..835b8440 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
@@ -331,6 +331,10 @@ public class AuthServiceImpl implements AuthService {
         if(ObjectUtil.isEmpty(existValidCode)) {
             throw new CommonException(AuthExceptionEnum.VALID_CODE_ERROR.getValue());
         }
+        // 不一致则直接验证码错误
+        if (!validCode.equalsIgnoreCase(Convert.toStr(existValidCode))) {
+            throw new CommonException("验证码错误");
+        }
         // 移除该验证码
         if(ObjectUtil.isEmpty(phoneOrEmail)) {
             // 图形验证码
@@ -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("验证码错误");
-        }
     }
 
     /**
diff --git a/snowy-web-app/src/main/resources/application.properties b/snowy-web-app/src/main/resources/application.properties
index 7341fe54..35fa6054 100644
--- a/snowy-web-app/src/main/resources/application.properties
+++ b/snowy-web-app/src/main/resources/application.properties
@@ -84,6 +84,7 @@ spring.datasource.dynamic.druid.validation-query-timeout=2000
 spring.datasource.dynamic.druid.test-on-borrow=false
 spring.datasource.dynamic.druid.test-on-return=false
 spring.datasource.dynamic.druid.test-while-idle=true
+spring.datasource.dynamic.druid.validation-query=SELECT 1
 spring.datasource.dynamic.druid.time-between-eviction-runs-millis=6000
 spring.datasource.dynamic.druid.min-evictable-idle-time-millis=300000
 spring.datasource.dynamic.druid.filters=stat