From d09acd7f7070b2c3060c31c84d894f2d7b812786 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 20 九月 2022 16:49:51 +0800
Subject: [PATCH] 调整菜单权限数据保存位置
---
sandu-common/src/main/java/com/sandu/common/security/token/JwtTokenProvider.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/sandu-common/src/main/java/com/sandu/common/security/token/JwtTokenProvider.java b/sandu-common/src/main/java/com/sandu/common/security/token/JwtTokenProvider.java
index acb61cf..fe01cb1 100644
--- a/sandu-common/src/main/java/com/sandu/common/security/token/JwtTokenProvider.java
+++ b/sandu-common/src/main/java/com/sandu/common/security/token/JwtTokenProvider.java
@@ -1,14 +1,19 @@
package com.sandu.common.security.token;
import com.sandu.common.enums.AdminStatusStatus;
+import com.sandu.common.execption.BusinessException;
+import com.sandu.common.redis.RedisService;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.config.SecurityProperties;
+import com.sandu.common.util.SpringContextHolder;
import io.jsonwebtoken.*;
import io.jsonwebtoken.io.Decoders;
import io.jsonwebtoken.io.DecodingException;
import io.jsonwebtoken.security.Keys;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.autoconfigure.cache.CacheProperties;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.stereotype.Component;
@@ -47,47 +52,62 @@
if (loginUserInfo.getUserId() == null) {
throw new IllegalArgumentException("鐢ㄦ埛id涓嶈兘涓虹┖");
}
+ RedisService redisService = SpringContextHolder.getBean(RedisService.class);
String authorities = loginUserInfo.getAuthorities().stream()
.map(GrantedAuthority::getAuthority)
.collect(Collectors.joining(","));
long now = (new Date()).getTime();
Date expiration = new Date(now + properties.getTokenValidityInSeconds());
-
- return Jwts.builder()
+ String token = Jwts.builder()
.setSubject(loginUserInfo.getUserId().toString())
- .claim(AUTHORITIES_KEY, authorities)
+ //鍘婚櫎token涓繚鐣欒彍鍗曟潈闄愭暟鎹�
+// .claim(AUTHORITIES_KEY, authorities)
.claim(CREDENTIALS_KEY, loginUserInfo.getAccount())
.claim(ADMINISTRATOR_KEY, loginUserInfo.getAdministratorType())
.setExpiration(expiration)
.signWith(key, SignatureAlgorithm.HS512)
.compact();
+
+ String key = String.format("%d_%d", loginUserInfo.getUserId(), loginUserInfo.getAdministratorType());
+ //鏀逛负璁茶彍鍗曟潈闄愭暟鎹繚瀛樺湪redis涓�
+ redisService.set(String.format("%s_%s", AUTHORITIES_KEY, token), authorities);
+ redisService.set(key, token, 2592000);
+ return token;
}
@Override
public LoginUserInfo validateToken(String token) {
try {
+ RedisService redisService = SpringContextHolder.getBean(RedisService.class);
+ String authorities = String.valueOf(redisService.get(String.format("%s_%s", AUTHORITIES_KEY, token)));
+
Claims claims = Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody();
LoginUserInfo loginUserInfo = new LoginUserInfo();
loginUserInfo.setUserId(Long.valueOf(claims.getSubject()));
loginUserInfo.setAccount(String.valueOf(claims.get(CREDENTIALS_KEY)));
- loginUserInfo.setPermission(claims.get(AUTHORITIES_KEY).toString());
+ //鍙栨秷浠巘oken涓彇鑿滃崟鏁版嵁
+// loginUserInfo.setPermission(claims.get(AUTHORITIES_KEY).toString());
+ //浠巖edis涓幏鍙栬彍鍗曟暟鎹�
+ loginUserInfo.setPermission(authorities);
loginUserInfo.setAdministratorType(Integer.parseInt(claims.get(ADMINISTRATOR_KEY).toString()));
loginUserInfo.setToken(token);
loginUserInfo.setStatus(AdminStatusStatus.NORMAL.getCode());
+ String key = String.format("%d_%d", loginUserInfo.getUserId(), loginUserInfo.getAdministratorType());
+ String redisToken = String.valueOf(redisService.get(key));
+ //TODO 涓婄嚎璁板緱鏀瑰洖鏉�
+// if (redisToken == null || !token.equals(redisToken)) {
+// throw new BusinessException("token鏃犳晥");
+// }
return loginUserInfo;
} catch (io.jsonwebtoken.security.SecurityException | MalformedJwtException e) {
log.info("Invalid JWT signature.");
-// e.printStackTrace();
} catch (ExpiredJwtException e) {
log.info("Expired JWT token.");
-// e.printStackTrace();
} catch (UnsupportedJwtException | DecodingException e) {
log.info("Unsupported JWT token.");
-// e.printStackTrace();
} catch (IllegalArgumentException e) {
log.info("JWT token compact of handler are invalid.");
-// e.printStackTrace();
}
return null;
--
Gitblit v1.9.3