|
@@ -33,10 +33,10 @@ public class JwtUtil {
|
|
|
/**
|
|
/**
|
|
|
* 生成JWT token
|
|
* 生成JWT token
|
|
|
*/
|
|
*/
|
|
|
- public String generateToken(String userId, String role) {
|
|
|
|
|
|
|
+ public String generateToken(String userId, String userRole) {
|
|
|
Map<String, Object> claims = new HashMap<>();
|
|
Map<String, Object> claims = new HashMap<>();
|
|
|
claims.put("userId", userId);
|
|
claims.put("userId", userId);
|
|
|
- claims.put("role", role);
|
|
|
|
|
|
|
+ claims.put("userRole", userRole);
|
|
|
return createToken(claims, userId);
|
|
return createToken(claims, userId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -90,7 +90,7 @@ public class JwtUtil {
|
|
|
public String getRoleFromToken(String token) {
|
|
public String getRoleFromToken(String token) {
|
|
|
try {
|
|
try {
|
|
|
Claims claims = getClaimsFromToken(token);
|
|
Claims claims = getClaimsFromToken(token);
|
|
|
- return claims.get("role", String.class);
|
|
|
|
|
|
|
+ return claims.get("userRole", String.class);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
log.warn("从token获取用户角色失败:{}", e.getMessage());
|
|
log.warn("从token获取用户角色失败:{}", e.getMessage());
|
|
|
return null;
|
|
return null;
|
|
@@ -116,7 +116,7 @@ public class JwtUtil {
|
|
|
try {
|
|
try {
|
|
|
Claims claims = getClaimsFromToken(token);
|
|
Claims claims = getClaimsFromToken(token);
|
|
|
String userId = claims.getSubject();
|
|
String userId = claims.getSubject();
|
|
|
- String role = claims.get("role", String.class);
|
|
|
|
|
|
|
+ String role = claims.get("userRole", String.class);
|
|
|
return generateToken(userId, role);
|
|
return generateToken(userId, role);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
log.warn("刷新token失败:{}", e.getMessage());
|
|
log.warn("刷新token失败:{}", e.getMessage());
|