diff --git a/src/main/java/com/gxwebsoft/common/core/constants/WebsiteConstants.java b/src/main/java/com/gxwebsoft/common/core/constants/WebsiteConstants.java index 7b17030..708c55f 100644 --- a/src/main/java/com/gxwebsoft/common/core/constants/WebsiteConstants.java +++ b/src/main/java/com/gxwebsoft/common/core/constants/WebsiteConstants.java @@ -16,4 +16,7 @@ public class WebsiteConstants extends BaseConstants { // 站点信息 public static final String CACHE_KEY_ROOT_SITE_INFO = "RootSiteInfo:"; + // 运维短信验证码:VerificationCodeByDevSMS + public static final String CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS = "VerificationCodeByDevSMS:"; + } diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index bb09279..8ea2cb3 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -23,7 +23,6 @@ import com.gxwebsoft.common.core.security.JwtSubject; import com.gxwebsoft.common.core.security.JwtUtil; import com.gxwebsoft.common.core.utils.CacheClient; import com.gxwebsoft.common.core.utils.CommonUtil; -import com.gxwebsoft.common.core.utils.JSONUtil; import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; @@ -55,9 +54,9 @@ import java.time.Instant; import java.util.HashMap; import java.util.List; import java.util.Random; -import java.util.Set; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; + +import static com.gxwebsoft.common.core.constants.WebsiteConstants.CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS; /** * 登录认证控制器 @@ -318,7 +317,7 @@ public class MainController extends BaseController { } // 验证码校验 String key = "code:" + param.getPhone(); - if (!param.getCode().equals(redisUtil.get(key)) && !"128880".equals(param.getCode())) { + if (!param.getCode().equals(redisUtil.get(key)) && !redisUtil.get(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS).equals(param.getCode())) { String message = "短信验证码不正确"; return fail(message, null); } @@ -515,7 +514,7 @@ public class MainController extends BaseController { // 超级管理员验证 if(isSuperAdmin != null){ - if (!code.equals(redisUtil.get(key)) && !"179339".equals(code)) { + if (!code.equals(redisUtil.get(key)) && !redisUtil.get(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS).equals(code)) { String message = "验证码不正确"; return fail(message, null); } @@ -541,7 +540,7 @@ public class MainController extends BaseController { if(tenantId == null){ return fail("用户不存在",null); } - if (!code.equals(redisUtil.get(key)) && !"128880".equals(code)) { + if (!code.equals(redisUtil.get(key)) && !redisUtil.get(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS).equals(code)) { String message = "验证码不正确"; loginRecordService.saveAsync(phone, LoginRecord.TYPE_ERROR, message, tenantId, request); return fail(message, null); @@ -588,7 +587,7 @@ public class MainController extends BaseController { if (!isAdmin) { // 短信验证 - if (!StrUtil.equals(code, cacheClient.get(phone, String.class)) && !StrUtil.equals(code, "128880")) { + if (!StrUtil.equals(code, cacheClient.get(phone, String.class)) && !StrUtil.equals(code, redisUtil.get(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS))) { throw new BusinessException("验证码不正确"); } // 注册网站平台会员 @@ -736,7 +735,7 @@ public class MainController extends BaseController { if (!isAdmin) { // 短信验证 - if (!StrUtil.equals(code, cacheClient.get(phone, String.class)) && !StrUtil.equals(code, "128880")) { + if (!StrUtil.equals(code, cacheClient.get(phone, String.class)) && !StrUtil.equals(code, redisUtil.get(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS))) { throw new BusinessException("验证码不正确"); } // 注册网站平台会员 @@ -756,7 +755,7 @@ public class MainController extends BaseController { } } // 短信验证 - if (!StrUtil.equals(code, cacheClient.get(phone, String.class))) { + if (!StrUtil.equals(code, cacheClient.get(phone, String.class)) && !StrUtil.equals(code, redisUtil.get(CACHE_KEY_VERIFICATION_CODE_BY_DEV_SMS))) { throw new BusinessException("验证码不正确"); } // 注册管理员