From a3f1a00078fa731b11826c2c54c005c31085bc4e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 26 七月 2021 13:15:37 +0800
Subject: [PATCH] udpate 更新 OSS模块 适配新规范
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 85 ++++++++++++++----------------------------
1 files changed, 29 insertions(+), 56 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 c55078d..f834570 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
@@ -9,12 +9,11 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.framework.config.properties.TokenProperties;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
@@ -25,22 +24,10 @@
/**
* token楠岃瘉澶勭悊
*
- * @author ruoyi
+ * @author Lion Li
*/
@Component
-public class TokenService
-{
- // 浠ょ墝鑷畾涔夋爣璇�
- @Value("${token.header}")
- private String header;
-
- // 浠ょ墝绉橀挜
- @Value("${token.secret}")
- private String secret;
-
- // 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- @Value("${token.expireTime}")
- private int expireTime;
+public class TokenService {
protected static final long MILLIS_SECOND = 1000;
@@ -51,17 +38,18 @@
@Autowired
private RedisCache redisCache;
+ @Autowired
+ private TokenProperties tokenProperties;
+
/**
* 鑾峰彇鐢ㄦ埛韬唤淇℃伅
*
* @return 鐢ㄦ埛淇℃伅
*/
- public LoginUser getLoginUser(HttpServletRequest request)
- {
+ public LoginUser getLoginUser(HttpServletRequest request) {
// 鑾峰彇璇锋眰鎼哄甫鐨勪护鐗�
String token = getToken(request);
- if (Validator.isNotEmpty(token))
- {
+ if (Validator.isNotEmpty(token)) {
Claims claims = parseToken(token);
// 瑙ｆ瀽瀵瑰簲鐨勬潈闄愪互鍙婄敤鎴蜂俊鎭�
String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
@@ -75,10 +63,8 @@
/**
* 璁剧疆鐢ㄦ埛韬唤淇℃伅
*/
- public void setLoginUser(LoginUser loginUser)
- {
- if (Validator.isNotNull(loginUser) && Validator.isNotEmpty(loginUser.getToken()))
- {
+ public void setLoginUser(LoginUser loginUser) {
+ if (Validator.isNotNull(loginUser) && Validator.isNotEmpty(loginUser.getToken())) {
refreshToken(loginUser);
}
}
@@ -86,10 +72,8 @@
/**
* 鍒犻櫎鐢ㄦ埛韬唤淇℃伅
*/
- public void delLoginUser(String token)
- {
- if (Validator.isNotEmpty(token))
- {
+ public void delLoginUser(String token) {
+ if (Validator.isNotEmpty(token)) {
String userKey = getTokenKey(token);
redisCache.deleteObject(userKey);
}
@@ -101,8 +85,7 @@
* @param loginUser 鐢ㄦ埛淇℃伅
* @return 浠ょ墝
*/
- public String createToken(LoginUser loginUser)
- {
+ public String createToken(LoginUser loginUser) {
String token = IdUtil.fastUUID();
loginUser.setToken(token);
setUserAgent(loginUser);
@@ -119,12 +102,10 @@
* @param loginUser
* @return 浠ょ墝
*/
- public void verifyToken(LoginUser loginUser)
- {
+ public void verifyToken(LoginUser loginUser) {
long expireTime = loginUser.getExpireTime();
long currentTime = System.currentTimeMillis();
- if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
- {
+ if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
refreshToken(loginUser);
}
}
@@ -134,13 +115,12 @@
*
* @param loginUser 鐧诲綍淇℃伅
*/
- public void refreshToken(LoginUser loginUser)
- {
+ public void refreshToken(LoginUser loginUser) {
loginUser.setLoginTime(System.currentTimeMillis());
- loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
+ loginUser.setExpireTime(loginUser.getLoginTime() + tokenProperties.getExpireTime() * MILLIS_MINUTE);
// 鏍规嵁uuid灏唋oginUser缂撳瓨
String userKey = getTokenKey(loginUser.getToken());
- redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+ redisCache.setCacheObject(userKey, loginUser, tokenProperties.getExpireTime(), TimeUnit.MINUTES);
}
/**
@@ -148,10 +128,9 @@
*
* @param loginUser 鐧诲綍淇℃伅
*/
- public void setUserAgent(LoginUser loginUser)
- {
+ public void setUserAgent(LoginUser loginUser) {
UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
- String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+ String ip = ServletUtils.getClientIP();
loginUser.setIpaddr(ip);
loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
loginUser.setBrowser(userAgent.getBrowser().getName());
@@ -164,11 +143,10 @@
* @param claims 鏁版嵁澹版槑
* @return 浠ょ墝
*/
- private String createToken(Map<String, Object> claims)
- {
+ private String createToken(Map<String, Object> claims) {
String token = Jwts.builder()
.setClaims(claims)
- .signWith(SignatureAlgorithm.HS512, secret).compact();
+ .signWith(SignatureAlgorithm.HS512, tokenProperties.getSecret()).compact();
return token;
}
@@ -178,10 +156,9 @@
* @param token 浠ょ墝
* @return 鏁版嵁澹版槑
*/
- private Claims parseToken(String token)
- {
+ private Claims parseToken(String token) {
return Jwts.parser()
- .setSigningKey(secret)
+ .setSigningKey(tokenProperties.getSecret())
.parseClaimsJws(token)
.getBody();
}
@@ -192,8 +169,7 @@
* @param token 浠ょ墝
* @return 鐢ㄦ埛鍚�
*/
- public String getUsernameFromToken(String token)
- {
+ public String getUsernameFromToken(String token) {
Claims claims = parseToken(token);
return claims.getSubject();
}
@@ -204,18 +180,15 @@
* @param request
* @return token
*/
- private String getToken(HttpServletRequest request)
- {
- String token = request.getHeader(header);
- if (Validator.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX))
- {
+ private String getToken(HttpServletRequest request) {
+ String token = request.getHeader(tokenProperties.getHeader());
+ if (Validator.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) {
token = token.replace(Constants.TOKEN_PREFIX, "");
}
return token;
}
- private String getTokenKey(String uuid)
- {
+ private String getTokenKey(String uuid) {
return Constants.LOGIN_TOKEN_KEY + uuid;
}
}
--
Gitblit v1.9.3