From 983bdb5b89932b38d08a11ad1eed6ea89d1597e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 29 Jan 2024 10:07:31 +0800
Subject: [PATCH] 更新
---
assess-framework/src/main/java/com/gkhy/assess/framework/shiro/service/SysLoginService.java | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 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 a6676c0..ab85786 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
@@ -1,6 +1,8 @@
package com.gkhy.assess.framework.shiro.service;
import com.gkhy.assess.common.constant.CacheConstant;
+import com.gkhy.assess.common.enums.ApproveStatusEnum;
+import com.gkhy.assess.common.enums.UserIdentityEnum;
import com.gkhy.assess.common.enums.UserStatusEnum;
import com.gkhy.assess.common.exception.ApiException;
import com.gkhy.assess.common.utils.JwtTokenUtil;
@@ -13,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
@Component
@@ -23,6 +26,8 @@
private SysPasswordService passwordService;
@Autowired
private RedisUtils redisUtils;
+ @Autowired
+ private HttpServletRequest request;
public SysUser login(String username, String password) {
SysUser sysUser=sysUserService.getUserByUsernamePhone(username);
@@ -34,25 +39,44 @@
public void validUser(SysUser sysUser){
if(sysUser==null) {
- throw new ApiException("用户不存在");
+ throw new AuthenticationException("用户不存在");
+ }
+ String uri=request.getRequestURI();
+ if(uri.startsWith("/api/system")){
+ if(UserIdentityEnum.EXPERT.getCode().equals(sysUser.getIdentity())){
+ throw new AuthenticationException("专家用户无权登录后台");
+ }
+ }else if(uri.startsWith("/api/app/")){
+ if(!UserIdentityEnum.EXPERT.getCode().equals(sysUser.getIdentity())){
+ throw new AuthenticationException("只有专家用户才能登录APP");
+ }
}
if(UserStatusEnum.DELETED.getCode().equals(sysUser.getDelFlag())){
- throw new ApiException("用户已被删除");
+ throw new AuthenticationException("用户已被删除");
}
if(UserStatusEnum.DISABLE.getCode().equals(sysUser.getStatus())){
- throw new ApiException("用户已被停用");
+ 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){
+
String username= JwtTokenUtil.getUsername(jwtToken);
if(StringUtils.isEmpty(username)){
throw new AuthenticationException("token非法无效!");
}
SysUser sysUser=sysUserService.getUserByUsernamePhone(username);
validUser(sysUser);
+ if(!JwtTokenUtil.verify(jwtToken,username,sysUser.getPassword())){
+ throw new AuthenticationException("token非法无效!");
+ }
if(!jwtTokenRefresh(jwtToken,username,sysUser.getPassword())){
- throw new AuthenticationException("Token失效，请重新登录!");
+ throw new AuthenticationException("Token已失效，请重新登录!");
}
// setRolePermission(sysUser);
return sysUser;
@@ -72,15 +96,17 @@
* @return
*/
public boolean jwtTokenRefresh(String jwtToken,String username,String passWord){
- String key=redisUtils.generateKey(CacheConstant.SYS_USER_TOKEN+":"+JwtTokenUtil.md5Encode(jwtToken));
- String cacheToken= (String) redisUtils.get(key);
+ String tokenKey=redisUtils.generateKey(CacheConstant.SYS_USER_TOKEN+":"+JwtTokenUtil.md5Encode(jwtToken));
+ String userKey=redisUtils.generateKey(CacheConstant.SYS_USER_TOKEN+":"+username);
+ String cacheToken= (String) redisUtils.get(tokenKey);
if(StringUtils.isNotEmpty(cacheToken)){
// 校验token有效性
- if(!JwtTokenUtil.verify(cacheToken,username,passWord)){
+ if(!JwtTokenUtil.isNeedUpdate(cacheToken,username,passWord)){
String newToken=JwtTokenUtil.sign(username,passWord);
// 设置超时时间
- redisUtils.set(key,newToken);
- redisUtils.expire(key,JwtTokenUtil.EXPIRATION*2/1000);
+ redisUtils.set(tokenKey,newToken);
+ redisUtils.expire(tokenKey,JwtTokenUtil.EXPIRATION*2/1000);
+ redisUtils.expire(userKey,(JwtTokenUtil.EXPIRATION*2/1000)+2);
}
return true;
}
--
Gitblit v1.9.2