gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pre Merge pull request !262 from bubu/dev

pull/262/MERGE
bubu 2025-05-17 04:09:24 +00:00 committed by Gitee
parent 8cc151014d 285bdc43f5
commit 49cb3f02fb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 176 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/enums/AuthExceptionEnum.java
View File

@ -29,6 +29,9 @@ public enum AuthExceptionEnum {
/** 验证码请求号不能为空 */ /** 验证码请求号不能为空 */
VALID_CODE_REQ_NO_EMPTY("验证码请求号不能为空"), VALID_CODE_REQ_NO_EMPTY("验证码请求号不能为空"),
/** 验证码过期 */
VALID_CODE_EXPIRED("验证码过期"),
/** 验证码错误 */ /** 验证码错误 */
VALID_CODE_ERROR("验证码错误"), VALID_CODE_ERROR("验证码错误"),

14
snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java
View File

@ -327,11 +327,15 @@ public class AuthServiceImpl implements AuthService {
// 手机或者邮箱验证码 // 手机或者邮箱验证码
existValidCode = commonCacheOperator.get(AUTH_VALID_CODE_CACHE_KEY + phoneOrEmail + StrUtil.UNDERLINE + validCodeReqNo); 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()); throw new CommonException(AuthExceptionEnum.VALID_CODE_ERROR.getValue());
} }
// 移除该验证码 // 验证成功，移除该验证码
if(ObjectUtil.isEmpty(phoneOrEmail)) { if(ObjectUtil.isEmpty(phoneOrEmail)) {
// 图形验证码 // 图形验证码
commonCacheOperator.remove(AUTH_VALID_CODE_CACHE_KEY + validCodeReqNo); 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); commonCacheOperator.remove(AUTH_VALID_CODE_CACHE_KEY + phoneOrEmail + StrUtil.UNDERLINE + validCodeReqNo);
} }
// 不一致则直接验证码错误
if (!validCode.equalsIgnoreCase(Convert.toStr(existValidCode))) {
throw new CommonException("验证码错误");
}
} }
/** /**

2
snowy-web-app/src/main/java/vip/xiaonuo/core/config/JacksonConfig.java → snowy-web-app/src/main/java/vip/xiaonuo/core/config/JacksonConfigure.java
View File

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

1
snowy-web-app/src/main/resources/application.properties
View File

@ -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-borrow=false
spring.datasource.dynamic.druid.test-on-return=false spring.datasource.dynamic.druid.test-on-return=false
spring.datasource.dynamic.druid.test-while-idle=true 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.time-between-eviction-runs-millis=6000
spring.datasource.dynamic.druid.min-evictable-idle-time-millis=300000 spring.datasource.dynamic.druid.min-evictable-idle-time-millis=300000
spring.datasource.dynamic.druid.filters=stat spring.datasource.dynamic.druid.filters=stat