From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 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 f54130a..eaf8786 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
@@ -3,6 +3,10 @@
import cn.hutool.core.util.IdUtil;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.jwt.JWTUtil;
+import cn.hutool.jwt.signers.JWTSigner;
+import cn.hutool.jwt.signers.JWTSignerUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.service.TokenService;
@@ -11,9 +15,6 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -49,16 +50,16 @@
// 鑾峰彇璇锋眰鎼哄甫鐨勪护鐗�
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 {
+ JSONObject claims = parseToken(token);
+ // 瑙ｆ瀽瀵瑰簲鐨勬潈闄愪互鍙婄敤鎴蜂俊鎭�
+ String uuid = claims.getStr(Constants.LOGIN_USER_KEY);
+ String userKey = getTokenKey(uuid);
+ LoginUser user = RedisUtils.getCacheObject(userKey);
+ return user;
+ } catch (Exception e) {
- }
+ }
}
return null;
}
@@ -153,9 +154,8 @@
* @return 浠ょ墝
*/
private String createToken(Map<String, Object> claims) {
- String token = Jwts.builder()
- .setClaims(claims)
- .signWith(SignatureAlgorithm.HS512, tokenProperties.getSecret()).compact();
+ JWTSigner signer = JWTSignerUtil.hs512(tokenProperties.getSecret().getBytes());
+ String token = JWTUtil.createToken(claims, signer);
return token;
}
@@ -165,11 +165,9 @@
* @param token 浠ょ墝
* @return 鏁版嵁澹版槑
*/
- private Claims parseToken(String token) {
- return Jwts.parser()
- .setSigningKey(tokenProperties.getSecret())
- .parseClaimsJws(token)
- .getBody();
+ private JSONObject parseToken(String token) {
+ JWTSigner signer = JWTSignerUtil.hs512(tokenProperties.getSecret().getBytes());
+ return JWTUtil.parseToken(token).setSigner(signer).getPayload().getClaimsJson();
}
/**
@@ -180,8 +178,8 @@
*/
@Override
public String getUsernameFromToken(String token) {
- Claims claims = parseToken(token);
- return claims.getSubject();
+ JSONObject claims = parseToken(token);
+ return claims.getStr("sub");
}
/**
--
Gitblit v1.9.3