From fa704f6171d81a0529230070cfb629be53439527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= Date: Mon, 22 Jan 2024 18:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=99=BB=E5=BD=95=E3=80=81?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E9=89=B4=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/api/constant/CacheConstants.java | 44 +++++++++++++++++++ .../api/{common => constant}/Constants.java | 2 +- .../qihang/oms/api/service/TokenService.java | 17 +++---- .../qihang/oms/api/utils/ServletUtils.java | 2 +- .../com/qihang/oms/api/utils/StringUtils.java | 2 +- .../qihang/oms/api/utils/http/HttpUtils.java | 2 +- .../qihang/oms/api/utils/ip/AddressUtils.java | 2 +- 7 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 oms-api/src/main/java/com/qihang/oms/api/constant/CacheConstants.java rename oms-api/src/main/java/com/qihang/oms/api/{common => constant}/Constants.java (98%) diff --git a/oms-api/src/main/java/com/qihang/oms/api/constant/CacheConstants.java b/oms-api/src/main/java/com/qihang/oms/api/constant/CacheConstants.java new file mode 100644 index 00000000..2bdb1f9c --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/api/constant/CacheConstants.java @@ -0,0 +1,44 @@ +package com.qihang.oms.api.constant; + +/** + * 缓存的key 常量 + * + * @author qihang + */ +public class CacheConstants +{ + /** + * 登录用户 redis key + */ + public static final String LOGIN_TOKEN_KEY = "login_tokens:"; + + /** + * 验证码 redis key + */ + public static final String CAPTCHA_CODE_KEY = "captcha_codes:"; + + /** + * 参数管理 cache key + */ + public static final String SYS_CONFIG_KEY = "sys_config:"; + + /** + * 字典管理 cache key + */ + public static final String SYS_DICT_KEY = "sys_dict:"; + + /** + * 防重提交 redis key + */ + public static final String REPEAT_SUBMIT_KEY = "repeat_submit:"; + + /** + * 限流 redis key + */ + public static final String RATE_LIMIT_KEY = "rate_limit:"; + + /** + * 登录账户密码错误次数 redis key + */ + public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:"; +} diff --git a/oms-api/src/main/java/com/qihang/oms/api/common/Constants.java b/oms-api/src/main/java/com/qihang/oms/api/constant/Constants.java similarity index 98% rename from oms-api/src/main/java/com/qihang/oms/api/common/Constants.java rename to oms-api/src/main/java/com/qihang/oms/api/constant/Constants.java index 15fc24fa..b181a856 100644 --- a/oms-api/src/main/java/com/qihang/oms/api/common/Constants.java +++ b/oms-api/src/main/java/com/qihang/oms/api/constant/Constants.java @@ -1,4 +1,4 @@ -package com.qihang.oms.api.common; +package com.qihang.oms.api.constant; import io.jsonwebtoken.Claims; diff --git a/oms-api/src/main/java/com/qihang/oms/api/service/TokenService.java b/oms-api/src/main/java/com/qihang/oms/api/service/TokenService.java index 31e02fa5..fd403bde 100644 --- a/oms-api/src/main/java/com/qihang/oms/api/service/TokenService.java +++ b/oms-api/src/main/java/com/qihang/oms/api/service/TokenService.java @@ -2,6 +2,8 @@ package com.qihang.oms.api.service; import com.alibaba.cloud.commons.lang.StringUtils; import com.qihang.oms.api.config.RedisCache; +import com.qihang.oms.api.constant.CacheConstants; +import com.qihang.oms.api.constant.Constants; import com.qihang.oms.api.domain.LoginUser; import com.qihang.oms.api.utils.IdUtils; import com.qihang.oms.api.utils.ServletUtils; @@ -64,7 +66,7 @@ public class TokenService { Claims claims = parseToken(token); // 解析对应的权限以及用户信息 - String uuid = (String) claims.get("login_user_key"); + String uuid = (String) claims.get(Constants.LOGIN_USER_KEY); String userKey = getTokenKey(uuid); LoginUser user = redisCache.getCacheObject(userKey); return user; @@ -113,7 +115,7 @@ public class TokenService refreshToken(loginUser); Map claims = new HashMap<>(); - claims.put("login_user_key", token); + claims.put(Constants.LOGIN_USER_KEY, token); return createToken(claims); } @@ -211,16 +213,15 @@ public class TokenService private String getToken(HttpServletRequest request) { String token = request.getHeader("Authorization"); -// if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) -// { -// token = token.replace(Constants.TOKEN_PREFIX, ""); -// } + if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) + { + token = token.replace(Constants.TOKEN_PREFIX, ""); + } return token; } private String getTokenKey(String uuid) { -// return CacheConstants.LOGIN_TOKEN_KEY + uuid; - return uuid; + return CacheConstants.LOGIN_TOKEN_KEY + uuid; } } diff --git a/oms-api/src/main/java/com/qihang/oms/api/utils/ServletUtils.java b/oms-api/src/main/java/com/qihang/oms/api/utils/ServletUtils.java index 9c1b2136..ca205b6b 100644 --- a/oms-api/src/main/java/com/qihang/oms/api/utils/ServletUtils.java +++ b/oms-api/src/main/java/com/qihang/oms/api/utils/ServletUtils.java @@ -1,7 +1,7 @@ package com.qihang.oms.api.utils; -import com.qihang.oms.api.common.Constants; +import com.qihang.oms.api.constant.Constants; import com.qihang.oms.api.common.Convert; import jakarta.servlet.ServletRequest; import jakarta.servlet.http.HttpServletRequest; diff --git a/oms-api/src/main/java/com/qihang/oms/api/utils/StringUtils.java b/oms-api/src/main/java/com/qihang/oms/api/utils/StringUtils.java index 6bf1b28d..0782143f 100644 --- a/oms-api/src/main/java/com/qihang/oms/api/utils/StringUtils.java +++ b/oms-api/src/main/java/com/qihang/oms/api/utils/StringUtils.java @@ -1,7 +1,7 @@ package com.qihang.oms.api.utils; -import com.qihang.oms.api.common.Constants; +import com.qihang.oms.api.constant.Constants; import com.qihang.oms.api.common.StrFormatter; import org.springframework.util.AntPathMatcher; diff --git a/oms-api/src/main/java/com/qihang/oms/api/utils/http/HttpUtils.java b/oms-api/src/main/java/com/qihang/oms/api/utils/http/HttpUtils.java index c84c3b55..ad00cd61 100644 --- a/oms-api/src/main/java/com/qihang/oms/api/utils/http/HttpUtils.java +++ b/oms-api/src/main/java/com/qihang/oms/api/utils/http/HttpUtils.java @@ -1,6 +1,6 @@ package com.qihang.oms.api.utils.http; -import com.qihang.oms.api.common.Constants; +import com.qihang.oms.api.constant.Constants; import com.qihang.oms.api.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oms-api/src/main/java/com/qihang/oms/api/utils/ip/AddressUtils.java b/oms-api/src/main/java/com/qihang/oms/api/utils/ip/AddressUtils.java index 88618e0b..6e3eb859 100644 --- a/oms-api/src/main/java/com/qihang/oms/api/utils/ip/AddressUtils.java +++ b/oms-api/src/main/java/com/qihang/oms/api/utils/ip/AddressUtils.java @@ -2,7 +2,7 @@ package com.qihang.oms.api.utils.ip; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.qihang.oms.api.common.Constants; +import com.qihang.oms.api.constant.Constants; import com.qihang.oms.api.utils.http.HttpUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory;