Pre Merge pull request !263 from 小诺/dev

README.md

@@ -16,6 +16,9 @@ Snowy谐音“小诺”，恰应小诺团队名称；意思为”下雪的、纯
 
 <p align="center">     
     <p align="center">
+        <a href="https://gitcode.com/xiaonuobase/Snowy">
+            <img src="https://gitcode.com/xiaonuobase/Snowy/star/badge.svg" alt="bootstrap">
+        </a>
         <a href="https://gitee.com/xiaonuobase/snowy">
             <img src="https://gitee.com/xiaonuobase/snowy/badge/star.svg?theme=dark" alt="Gitee star">
         </a>

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("验证码错误"),
 

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("验证码错误");
-        }
     }
 
     /**

snowy-web-app/src/main/java/vip/xiaonuo/core/config/JacksonConfigure.java

@@ -27,7 +27,7 @@ import java.util.Map;
  * 用于处理返回结果null值改为类型初始值等问题
  */
 @Configuration
-public class JacksonConfig {
+public class JacksonConfigure {
 
     private static final ThreadLocal<Boolean> IS_APP_REQUEST = ThreadLocal.withInitial(() -> false);
 

snowy-web-app/src/main/resources/_sql/snowy_mysql.sql

@@ -895,7 +895,7 @@ CREATE TABLE `MOBILE_RESOURCE`  (
 INSERT INTO `MOBILE_RESOURCE` VALUES ('1623380023993298945', NULL, '业务', '217gcp9ifi', 'MODULE', NULL, NULL, NULL, 'container-outlined', '#1890ff', NULL, NULL, 1, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL);
 INSERT INTO `MOBILE_RESOURCE` VALUES ('1623380258656219138', '0', '机构管理', 'UJ3Iwy3jsW', 'MENU', '1623380023993298945', 'MENU', '/pages/biz/org/index', 'apartment-outlined', '#1890ff', 'YES', 'ENABLE', 0, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL);
 INSERT INTO `MOBILE_RESOURCE` VALUES ('1623380614295449601', '0', '岗位管理', 'sjIY9oGYir', 'MENU', '1623380023993298945', 'MENU', '/pages/biz/position/index', 'robot-outlined', '#9c28b1', 'YES', 'ENABLE', 2, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL);
-INSERT INTO `MOBILE_RESOURCE` VALUES ('1623380765202313218', '0', '人员管理', 'sjIY9oGYir', 'MENU', '1623380023993298945', 'MENU', '/pages/biz/user/index', 'team-outlined', '#fed835', 'YES', 'ENABLE', 4, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL);
+INSERT INTO `MOBILE_RESOURCE` VALUES ('1623380765202313218', '0', '人员管理', '2ppITl9dMw', 'MENU', '1623380023993298945', 'MENU', '/pages/biz/user/index', 'team-outlined', '#fed835', 'YES', 'ENABLE', 4, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL);
 INSERT INTO `MOBILE_RESOURCE` VALUES ('1623381127095250946', '0', '更多', 'mFVJNzE7gx', 'MENU', '1623380023993298945', 'CATALOG', '7029146815941316608', 'small-dash-outlined', '#f1627e', 'YES', 'ENABLE', 7, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL);
 INSERT INTO `MOBILE_RESOURCE` VALUES ('1623381298801668098', '1623380258656219138', '新增机构', 'mobileBizOrgAdd', 'BUTTON', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL);
 INSERT INTO `MOBILE_RESOURCE` VALUES ('1623381632131395586', '1623380258656219138', '编辑机构', 'mobileBizOrgEdit', 'BUTTON', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 2, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL);

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