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 e03731c5..285cee38 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 @@ -11,7 +11,6 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.dromara.common.core.constant.TenantConstants; import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.enums.DeviceType; import org.dromara.common.core.enums.UserType; import org.dromara.system.api.model.LoginUser; @@ -53,7 +52,7 @@ public class LoginHelper { StpUtil.login(loginUser.getLoginId(), model.setExtra(TENANT_KEY, loginUser.getTenantId()) .setExtra(USER_KEY, loginUser.getUserId())); - StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser); + StpUtil.getSession().set(LOGIN_USER_KEY, loginUser); } /** @@ -64,7 +63,7 @@ public class LoginHelper { if (loginUser != null) { return loginUser; } - SaSession session = StpUtil.getTokenSession(); + SaSession session = StpUtil.getSession(); if (ObjectUtil.isNull(session)) { return null; } @@ -77,7 +76,8 @@ public class LoginHelper { * 获取用户基于token */ public static LoginUser getLoginUser(String token) { - SaSession session = StpUtil.getTokenSessionByToken(token); + Object loginId = StpUtil.getLoginIdByToken(token); + SaSession session = StpUtil.getSessionByLoginId(loginId); if (ObjectUtil.isNull(session)) { return null; }