From 28aaf2ffa1dbb860a292ba330a7e9362e60e7832 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Fri, 12 Jul 2024 16:41:03 +0800
Subject: [PATCH] update
---
assess-framework/src/main/java/com/gkhy/assess/framework/shiro/service/SysLoginService.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/assess-framework/src/main/java/com/gkhy/assess/framework/shiro/service/SysLoginService.java b/assess-framework/src/main/java/com/gkhy/assess/framework/shiro/service/SysLoginService.java
index 96d9a40..f2a37b9 100644
--- a/assess-framework/src/main/java/com/gkhy/assess/framework/shiro/service/SysLoginService.java
+++ b/assess-framework/src/main/java/com/gkhy/assess/framework/shiro/service/SysLoginService.java
@@ -56,11 +56,11 @@
if(UserStatusEnum.DISABLE.getCode().equals(sysUser.getStatus())){
throw new AuthenticationException("用户已被停用");
}
- if(UserIdentityEnum.AGENCY.getCode().equals(sysUser.getIdentity())){
- if(!ApproveStatusEnum.APPROVED.getCode().equals(sysUser.getState())){
- throw new AuthenticationException("机构账户审批还未通过");
- }
- }
+// if(UserIdentityEnum.AGENCY.getCode().equals(sysUser.getIdentity())){
+// if(!ApproveStatusEnum.APPROVED.getCode().equals(sysUser.getState())){
+// throw new AuthenticationException("机构账户审批还未通过");
+// }
+// }
}
public SysUser validJwtToken(String jwtToken){
@@ -76,7 +76,7 @@
throw new AuthenticationException("token非法无效!");
}
if(!jwtTokenRefresh(jwtToken,username,sysUser.getPassword(),identity)){
- throw new AuthenticationException("Token已失效，请重新登录!");
+ throw new AuthenticationException("您的账号登录过期，请重新登录!");
}
// setRolePermission(sysUser);
return sysUser;
@@ -97,16 +97,15 @@
*/
public boolean jwtTokenRefresh(String jwtToken, String username, String passWord, Integer identity){
String tokenKey=redisUtils.generateKey(CacheConstant.SYS_USER_TOKEN+":"+JwtTokenUtil.md5Encode(jwtToken));
- String userKey=redisUtils.generateKey(CacheConstant.SYS_USER_TOKEN+":"+username+"_"+identity);
+ // String userKey=redisUtils.generateKey(CacheConstant.SYS_USER_TOKEN+":"+username+"_"+identity);
String cacheToken= (String) redisUtils.get(tokenKey);
if(StringUtils.isNotEmpty(cacheToken)){
// 校验token有效性
if(!JwtTokenUtil.isNeedUpdate(cacheToken,username,passWord,identity)){
String newToken=JwtTokenUtil.sign(username,passWord,identity);
// 设置超时时间
- redisUtils.set(tokenKey,newToken);
- redisUtils.expire(tokenKey,JwtTokenUtil.EXPIRATION*2/1000);
- redisUtils.expire(userKey,(JwtTokenUtil.EXPIRATION*2/1000)+2);
+ redisUtils.set(tokenKey,newToken,JwtTokenUtil.EXPIRATION*2/1000);
+ // redisUtils.expire(userKey,(JwtTokenUtil.EXPIRATION*2/1000)+2);
}
return true;
}
--
Gitblit v1.9.2