From 069104c59845a36e62096841123353f526845308 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 23 Mar 2023 21:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=B8=B8=E9=87=8F=E5=91=BD=E5=90=8D=E5=8F=8A?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/common/constant/CacheConsts.java | 12 ++++++------ .../cnadmin/common/constant/SysConsts.java | 2 +- .../cnadmin/common/util/helper/LoginHelper.java | 16 ++++++---------- .../webapi/controller/auth/LoginController.java | 2 +- .../controller/common/CaptchaController.java | 10 +++++----- .../controller/monitor/OnlineUserController.java | 2 +- .../controller/system/UserCenterController.java | 2 +- 7 files changed, 21 insertions(+), 25 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java index ae7ee4a3..6df04bf4 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConsts.java @@ -29,17 +29,17 @@ import lombok.NoArgsConstructor; public class CacheConsts { /** - * 登录用户缓存键 + * 登录用户键 */ - public static final String LOGIN_USER_CACHE_KEY = "LOGIN_USER"; + public static final String LOGIN_USER_KEY = "LOGIN_USER"; /** - * 验证码缓存键 + * 验证码键前缀 */ - public static final String CAPTCHA_CACHE_KEY = "CAPTCHA"; + public static final String CAPTCHA_KEY_PREFIX = "CAPTCHA"; /** - * 限流缓存键 + * 限流键前缀 */ - public static final String LIMIT_CACHE_KEY = "LIMIT"; + public static final String LIMIT_KEY_PREFIX = "LIMIT"; } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java index fccf8a6f..64735bb9 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java @@ -41,7 +41,7 @@ public class SysConsts { /** * 全部权限标识 */ - public static final String ALL_PERMISSION = "*"; + public static final String ALL_PERMISSION = StringConsts.ASTERISK; /** * 默认密码 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java index 049b3b8a..73b75151 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java @@ -66,8 +66,7 @@ public class LoginHelper { // 登录保存用户信息 StpUtil.login(loginUser.getId()); loginUser.setToken(StpUtil.getTokenValue()); - SaHolder.getStorage().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); - StpUtil.getTokenSession().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); + StpUtil.getTokenSession().set(CacheConsts.LOGIN_USER_KEY, loginUser); } /** @@ -76,15 +75,12 @@ public class LoginHelper { * @return / */ public static LoginUser getLoginUser() { - LoginUser loginUser = (LoginUser)SaHolder.getStorage().get(CacheConsts.LOGIN_USER_CACHE_KEY); + LoginUser loginUser = (LoginUser)SaHolder.getStorage().get(CacheConsts.LOGIN_USER_KEY); if (loginUser != null) { return loginUser; } - try { - loginUser = (LoginUser)StpUtil.getTokenSession().get(CacheConsts.LOGIN_USER_CACHE_KEY); - SaHolder.getStorage().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); - } catch (Exception ignored) { - } + loginUser = (LoginUser)StpUtil.getTokenSession().get(CacheConsts.LOGIN_USER_KEY); + SaHolder.getStorage().set(CacheConsts.LOGIN_USER_KEY, loginUser); return loginUser; } @@ -95,8 +91,8 @@ public class LoginHelper { * 登录用户信息 */ public static void updateLoginUser(LoginUser loginUser) { - SaHolder.getStorage().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); - StpUtil.getTokenSession().set(CacheConsts.LOGIN_USER_CACHE_KEY, loginUser); + SaHolder.getStorage().set(CacheConsts.LOGIN_USER_KEY, loginUser); + StpUtil.getTokenSession().set(CacheConsts.LOGIN_USER_KEY, loginUser); } /** diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java index f7973deb..18662f27 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/auth/LoginController.java @@ -65,7 +65,7 @@ public class LoginController { @PostMapping("/login") public R login(@Validated @RequestBody LoginRequest loginRequest) { // 校验验证码 - String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_CACHE_KEY, loginRequest.getUuid()); + String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_KEY_PREFIX, loginRequest.getUuid()); String captcha = RedisUtils.getCacheObject(captchaKey); ValidationUtils.throwIfBlank(captcha, "验证码已失效"); RedisUtils.deleteCacheObject(captchaKey); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java index 97dad405..63358749 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java @@ -74,7 +74,7 @@ public class CaptchaController { // 保存验证码 String uuid = IdUtil.fastSimpleUUID(); - String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_CACHE_KEY, uuid); + String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_KEY_PREFIX, uuid); RedisUtils.setCacheObject(captchaKey, captcha.text(), Duration.ofMinutes(captchaImage.getExpirationInMinutes())); @@ -88,9 +88,9 @@ public class CaptchaController { public R getMailCaptcha( @NotBlank(message = "邮箱不能为空") @Pattern(regexp = RegexPool.EMAIL, message = "邮箱格式错误") String email) throws MessagingException { - String limitCacheKey = CacheConsts.LIMIT_CACHE_KEY; - String captchaCacheKey = CacheConsts.CAPTCHA_CACHE_KEY; - String limitCaptchaKey = RedisUtils.formatKey(limitCacheKey, captchaCacheKey, email); + String limitKeyPrefix = CacheConsts.LIMIT_KEY_PREFIX; + String captchaKeyPrefix = CacheConsts.CAPTCHA_KEY_PREFIX; + String limitCaptchaKey = RedisUtils.formatKey(limitKeyPrefix, captchaKeyPrefix, email); long limitTimeInMillisecond = RedisUtils.getTimeToLive(limitCaptchaKey); CheckUtils.throwIf(limitTimeInMillisecond > 0, "发送邮箱验证码过于频繁，请您 {}s 后再试", limitTimeInMillisecond / 1000); @@ -105,7 +105,7 @@ public class CaptchaController { MailUtils.sendHtml(email, String.format("【%s】邮箱验证码", properties.getName()), content); // 保存验证码 - String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_CACHE_KEY, email); + String captchaKey = RedisUtils.formatKey(captchaKeyPrefix, email); RedisUtils.setCacheObject(captchaKey, captcha, Duration.ofMinutes(expirationInMinutes)); RedisUtils.setCacheObject(limitCaptchaKey, captcha, Duration.ofSeconds(captchaMail.getLimitInSeconds())); return R.ok(String.format("发送成功，验证码有效期 %s 分钟", expirationInMinutes)); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java index 059a8eef..9c0fc517 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java @@ -74,7 +74,7 @@ public class OnlineUserController { // 获取 Token Session SaSession saSession = StpUtil.getTokenSessionByToken(token); - LoginUser loginUser = saSession.get(CacheConsts.LOGIN_USER_CACHE_KEY, new LoginUser()); + LoginUser loginUser = saSession.get(CacheConsts.LOGIN_USER_KEY, new LoginUser()); // 检查是否符合查询条件 if (Boolean.TRUE.equals(checkQuery(query, loginUser))) { diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java index db068da3..1bce65be 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java @@ -103,7 +103,7 @@ public class UserCenterController { ValidationUtils.throwIfBlank(rawCurrentPassword, "当前密码解密失败"); // 校验验证码 - String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_CACHE_KEY, updateEmailRequest.getNewEmail()); + String captchaKey = RedisUtils.formatKey(CacheConsts.CAPTCHA_KEY_PREFIX, updateEmailRequest.getNewEmail()); String captcha = RedisUtils.getCacheObject(captchaKey); ValidationUtils.throwIfBlank(captcha, "验证码已失效"); ValidationUtils.throwIfNotEqualIgnoreCase(updateEmailRequest.getCaptcha(), captcha, "验证码错误");