From 06ea0fe23faf2238d9d1141826ecb404367aecec Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 18 十月 2024 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 12 ++++++++----
1 files changed, 8 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..d748b39 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
@@ -94,7 +94,7 @@
public LoginUserApplet getLoginUserApplet() {
LoginUserApplet loginUserAppletToken = getLoginUserAppletToken(ServletUtils.getRequest());
if (loginUserAppletToken == null) {
- throw new UserAppletException("登录失效，请重新登录！", 401);
+ throw new RuntimeException("令牌已过期，请重新登录！");
}
return loginUserAppletToken;
}
@@ -130,7 +130,11 @@
* @return 用户信息
*/
public LoginUser getLoginUser() {
- return getLoginUser(ServletUtils.getRequest());
+ LoginUser loginUser = getLoginUser(ServletUtils.getRequest());
+ if (loginUser == null) {
+ throw new RuntimeException("令牌已过期，请重新登录！");
+ }
+ return loginUser;
}
/**
@@ -209,10 +213,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