From 9283fa6e32145ff0ae237c40d2008fc35e81ef7c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java | 3 +++
1 files changed, 3 insertions(+), 0 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 6d51e96..65c95b0 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
@@ -226,6 +226,7 @@
LoginUserInfo user = null;
if (StringUtils.isNotEmpty(token)) {
String userkey = JwtUtils.getUserKeyByWorker(token);
+ String tokenKeyByWorker = getTokenKeyByWorker(userkey);
user = redisService.getCacheObject(getTokenKeyByWorker(userkey));
// 再次判断登录状态是否已过期
if (null == user) {
@@ -233,10 +234,12 @@
}
// 优先判断当前账号是否已在其他设备登录
if (!user.getIsCanLogin()) {
+ redisService.deleteObject(tokenKeyByWorker);
throw new GlobalException("当前登录账号在其他设备登录！", 505);
}
// 再次判断登录状态是否已过期
if (System.currentTimeMillis() > user.getExpireTime()) {
+ redisService.deleteObject(tokenKeyByWorker);
throw new GlobalException("登录信息已过期，请重新登录！", 504);
}
return user;
--
Gitblit v1.7.1