From c80c0184b6e560d41d5aa5691874e07b681fa18f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 18:41:24 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
index 4cce577..d30a11f 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
@@ -5,6 +5,7 @@
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
 
+import com.ruoyi.common.core.exception.auth.NotLoginException;
 import com.ruoyi.common.core.exception.user.UserAppletException;
 import com.ruoyi.system.api.model.LoginUserApplet;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -94,7 +95,7 @@
 	public LoginUserApplet getLoginUserApplet() {
 		LoginUserApplet loginUserAppletToken = getLoginUserAppletToken(ServletUtils.getRequest());
 		if (loginUserAppletToken == null) {
-			throw new UserAppletException("登录失效,请重新登录!", 401);
+			throw new NotLoginException("令牌已过期,请重新登录!");
 		}
 		return loginUserAppletToken;
 	}
@@ -130,7 +131,11 @@
 	 * @return 用户信息
 	 */
 	public LoginUser getLoginUser() {
-		return getLoginUser(ServletUtils.getRequest());
+		LoginUser loginUser = getLoginUser(ServletUtils.getRequest());
+		if (loginUser == null) {
+			throw new NotLoginException("令牌已过期,请重新登录!");
+		}
+		return loginUser;
 	}
 	
 	/**
@@ -209,10 +214,10 @@
 	
 	public void refreshToken1(LoginUserApplet dto) {
 		dto.setLoginTime(System.currentTimeMillis());
-		dto.setExpireTime(dto.getLoginTime() + expireTime * MILLIS_MINUTE);
+		dto.setExpireTime(dto.getLoginTime() + expireAppletTime * MILLIS_MINUTE);
 		// 根据uuid将loginUser缓存
 		String userKey = getTokenKey(dto.getToken());
-		redisService.setCacheObject(userKey, dto, expireTime, TimeUnit.MINUTES);
+		redisService.setCacheObject(userKey, dto, expireAppletTime, TimeUnit.MINUTES);
 	}
 	
 	private String getTokenKey(String token) {

--
Gitblit v1.7.1