From 08ba802e122b93bbad235b78669bd8cac0e1d1d9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 六月 2023 12:27:42 +0800
Subject: [PATCH] reset 回滚 satoken 使用 loginType 分离登录用户 存在限制

---
 ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
index 99bd6b5..929d124 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
@@ -68,8 +68,7 @@
 //        } else if (userType == UserType.APP_USER) {
 //            model.setTimeout(86400).setActiveTimeout(1800);
 //        }
-        StpUtil.stpLogic.setLoginType(loginUser.getUserType())
-            .login(loginUser.getLoginId(),
+        StpUtil.login(loginUser.getLoginId(),
                 model.setExtra(TENANT_KEY, loginUser.getTenantId())
                     .setExtra(USER_KEY, loginUser.getUserId()));
         StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
@@ -155,7 +154,7 @@
      * 鑾峰彇鐢ㄦ埛绫诲瀷
      */
     public static UserType getUserType() {
-        String loginType = StpUtil.stpLogic.getLoginType();
+        String loginType = StpUtil.getLoginIdAsString();
         return UserType.getUserType(loginType);
     }
 

--
Gitblit v1.9.3