From f27a910d664189e0bb0b7f8b4702d224b89bbfea Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 29 十二月 2022 14:27:30 +0800
Subject: [PATCH] fix: depart status properties
---
ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java b/ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java
index 1ebaabf..594ac79 100644
--- a/ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java
+++ b/ycl-common/src/main/java/com/ycl/utils/JwtTokenUtil.java
@@ -96,7 +96,7 @@
* @param userDetails 浠庢暟鎹簱涓煡璇㈠嚭鏉ョ殑鐢ㄦ埛淇℃伅
*/
public boolean validateToken(String token, UserDetails userDetails) {
- String username = getUserNameFromToken(token);
+ String username = parseToken(token).getUsername();
return username.equals(userDetails.getUsername()) && !isTokenExpired(token);
}
@@ -174,6 +174,26 @@
return false;
}
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id,鐢ㄦ埛鍚嶇敓鎴恡oken
+ */
+ public String generateToken(long userId, String username) {
+ Map<String, Object> claims = new HashMap<>();
+ AuthInfo authInfo = new AuthInfo();
+ authInfo.setUserId(userId);
+ authInfo.setUsername(username);
+ claims.put(CLAIM_KEY_INFO, JSONObject.toJSONString(authInfo));
+ claims.put(CLAIM_KEY_CREATED, new Date());
+ return generateToken(claims);
+ }
+
+ /**
+ * 鏍规嵁token瑙ｆ瀽鍑篈uthInfo
+ * @param token
+ * @return
+ */
public AuthInfo parseToken(String token) {
AuthInfo authInfo = null;
try {
@@ -187,18 +207,5 @@
throw new ApiException(e.getMessage());
}
return authInfo;
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛id,鐢ㄦ埛鍚嶇敓鎴恡oken
- */
- public String generateToken(long userId, String username) {
- Map<String, Object> claims = new HashMap<>();
- AuthInfo authInfo = new AuthInfo();
- authInfo.setUserId(userId);
- authInfo.setUsername(username);
- claims.put(CLAIM_KEY_INFO, JSONObject.toJSONString(authInfo));
- claims.put(CLAIM_KEY_CREATED, new Date());
- return generateToken(claims);
}
}
--
Gitblit v1.8.0