From ddf8d6ad6b156ee03ed6e86f776a43c1ac17d689 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 九月 2021 13:48:22 +0800
Subject: [PATCH] 发布 v3.1.0
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
index a6ff95f..cb8878e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
@@ -1,13 +1,13 @@
package com.ruoyi.framework.web.service;
-import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.IdUtil;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.RedisUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.framework.config.properties.TokenProperties;
import io.jsonwebtoken.Claims;
@@ -36,9 +36,6 @@
private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
@Autowired
- private RedisCache redisCache;
-
- @Autowired
private TokenProperties tokenProperties;
/**
@@ -49,13 +46,13 @@
public LoginUser getLoginUser(HttpServletRequest request) {
// 鑾峰彇璇锋眰鎼哄甫鐨勪护鐗�
String token = getToken(request);
- if (Validator.isNotEmpty(token)) {
+ if (StringUtils.isNotEmpty(token)) {
try {
Claims claims = parseToken(token);
// 瑙ｆ瀽瀵瑰簲鐨勬潈闄愪互鍙婄敤鎴蜂俊鎭�
String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
String userKey = getTokenKey(uuid);
- LoginUser user = redisCache.getCacheObject(userKey);
+ LoginUser user = RedisUtils.getCacheObject(userKey);
return user;
} catch (Exception e) {
@@ -68,7 +65,7 @@
* 璁剧疆鐢ㄦ埛韬唤淇℃伅
*/
public void setLoginUser(LoginUser loginUser) {
- if (Validator.isNotNull(loginUser) && Validator.isNotEmpty(loginUser.getToken())) {
+ if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) {
refreshToken(loginUser);
}
}
@@ -77,9 +74,9 @@
* 鍒犻櫎鐢ㄦ埛韬唤淇℃伅
*/
public void delLoginUser(String token) {
- if (Validator.isNotEmpty(token)) {
+ if (StringUtils.isNotEmpty(token)) {
String userKey = getTokenKey(token);
- redisCache.deleteObject(userKey);
+ RedisUtils.deleteObject(userKey);
}
}
@@ -124,7 +121,7 @@
loginUser.setExpireTime(loginUser.getLoginTime() + tokenProperties.getExpireTime() * MILLIS_MINUTE);
// 鏍规嵁uuid灏唋oginUser缂撳瓨
String userKey = getTokenKey(loginUser.getToken());
- redisCache.setCacheObject(userKey, loginUser, tokenProperties.getExpireTime(), TimeUnit.MINUTES);
+ RedisUtils.setCacheObject(userKey, loginUser, tokenProperties.getExpireTime(), TimeUnit.MINUTES);
}
/**
@@ -186,7 +183,7 @@
*/
private String getToken(HttpServletRequest request) {
String token = request.getHeader(tokenProperties.getHeader());
- if (Validator.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) {
+ if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) {
token = token.replace(Constants.TOKEN_PREFIX, "");
}
return token;
--
Gitblit v1.9.3