From c4e17ff8472fd9f8123e86b593b2968ad5936b15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 01 十一月 2021 13:49:11 +0800
Subject: [PATCH] fix 修复 xxl-job-admin 部署问题
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
index ae95660..15b9759 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
@@ -15,7 +15,7 @@
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
@@ -27,7 +27,7 @@
*
* @author Lion Li
*/
-@Component
+@Service
public class TokenServiceImpl implements TokenService {
protected static final long MILLIS_SECOND = 1000;
@@ -44,20 +44,21 @@
*
* @return 鐢ㄦ埛淇℃伅
*/
+ @Override
public LoginUser getLoginUser(HttpServletRequest request) {
// 鑾峰彇璇锋眰鎼哄甫鐨勪护鐗�
String token = getToken(request);
if (StringUtils.isNotEmpty(token)) {
- try {
- Claims claims = parseToken(token);
- // 瑙ｆ瀽瀵瑰簲鐨勬潈闄愪互鍙婄敤鎴蜂俊鎭�
- String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
- String userKey = getTokenKey(uuid);
- LoginUser user = RedisUtils.getCacheObject(userKey);
- return user;
- } catch (Exception e) {
+ try {
+ Claims claims = parseToken(token);
+ // 瑙ｆ瀽瀵瑰簲鐨勬潈闄愪互鍙婄敤鎴蜂俊鎭�
+ String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
+ String userKey = getTokenKey(uuid);
+ LoginUser user = RedisUtils.getCacheObject(userKey);
+ return user;
+ } catch (Exception e) {
- }
+ }
}
return null;
}
@@ -65,6 +66,7 @@
/**
* 璁剧疆鐢ㄦ埛韬唤淇℃伅
*/
+ @Override
public void setLoginUser(LoginUser loginUser) {
if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) {
refreshToken(loginUser);
@@ -74,6 +76,7 @@
/**
* 鍒犻櫎鐢ㄦ埛韬唤淇℃伅
*/
+ @Override
public void delLoginUser(String token) {
if (StringUtils.isNotEmpty(token)) {
String userKey = getTokenKey(token);
@@ -87,6 +90,7 @@
* @param loginUser 鐢ㄦ埛淇℃伅
* @return 浠ょ墝
*/
+ @Override
public String createToken(LoginUser loginUser) {
String token = IdUtil.fastUUID();
loginUser.setToken(token);
@@ -104,6 +108,7 @@
* @param loginUser
* @return 浠ょ墝
*/
+ @Override
public void verifyToken(LoginUser loginUser) {
long expireTime = loginUser.getExpireTime();
long currentTime = System.currentTimeMillis();
@@ -117,6 +122,7 @@
*
* @param loginUser 鐧诲綍淇℃伅
*/
+ @Override
public void refreshToken(LoginUser loginUser) {
loginUser.setLoginTime(System.currentTimeMillis());
loginUser.setExpireTime(loginUser.getLoginTime() + tokenProperties.getExpireTime() * MILLIS_MINUTE);
@@ -130,6 +136,7 @@
*
* @param loginUser 鐧诲綍淇℃伅
*/
+ @Override
public void setUserAgent(LoginUser loginUser) {
UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
String ip = ServletUtils.getClientIP();
@@ -171,6 +178,7 @@
* @param token 浠ょ墝
* @return 鐢ㄦ埛鍚�
*/
+ @Override
public String getUsernameFromToken(String token) {
Claims claims = parseToken(token);
return claims.getSubject();
--
Gitblit v1.9.3