From 0dfecde9ebe89ec797b273823c52e44baf056df6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 24 六月 2024 09:51:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish

---
 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 661ab20..963d895 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
@@ -220,17 +220,17 @@
             String userkey = JwtUtils.getUserKeyStudy(token);
             user = redisService.getCacheObject(getTokenKeyStudy(userkey));
             // 再次判断登录状态是否已过期
-            if (null == user) {
-                throw new StudyLoginException("登录信息已过期,请重新登录!", 504);
-            }
-            // 优先判断当前账号是否已在其他设备登录
-            if (!user.getIsCanLogin()) {
-                throw new StudyLoginException("当前登录账号在其他设备登录!", 505);
-            }
-            // 再次判断登录状态是否已过期
-            if (System.currentTimeMillis() > user.getExpireTime()) {
-                throw new StudyLoginException("登录信息已过期,请重新登录!", 504);
-            }
+//            if (null == user) {
+//                throw new StudyLoginException("登录信息已过期,请重新登录!", 504);
+//            }
+//            // 优先判断当前账号是否已在其他设备登录
+//            if (!user.getIsCanLogin()) {
+//                throw new StudyLoginException("当前登录账号在其他设备登录!", 505);
+//            }
+//            // 再次判断登录状态是否已过期
+//            if (System.currentTimeMillis() > user.getExpireTime()) {
+//                throw new StudyLoginException("登录信息已过期,请重新登录!", 504);
+//            }
             return user;
         }
         return user;

--
Gitblit v1.7.1