diff --git a/pom.xml b/pom.xml index 39925178e..3afbd24f3 100644 --- a/pom.xml +++ b/pom.xml @@ -19,24 +19,24 @@ UTF-8 1.8 3.2.2 - 2.2.0 - 1.2.8 + 2.2.2 + 1.2.9 3.0.3 1.5.22 4.1.2 1.21 3.0.5 2.3 - 1.29.0 + 1.30.0 3.5.1 3.9.1 - 5.7.22 + 5.8.0 4.9.3 - 2.6.6 + 2.6.7 3.17.0 2.2.1 3.5.1 - 1.3.6 + 1.4.0 2.3.0 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java index 671400f6f..a07494bfe 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java @@ -2,7 +2,7 @@ package com.ruoyi.framework.config; import cn.dev33.satoken.interceptor.SaAnnotationInterceptor; import cn.dev33.satoken.interceptor.SaRouteInterceptor; -import cn.dev33.satoken.jwt.StpLogicJwtForStyle; +import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; @@ -67,8 +67,8 @@ public class SaTokenConfig implements WebMvcConfigurer { @Bean public StpLogic getStpLogicJwt() { - // Sa-Token 整合 jwt (Style模式) - return new StpLogicJwtForStyle(); + // Sa-Token 整合 jwt (简单模式) + return new StpLogicJwtForSimple(); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java index 88b23648e..dcb9b1996 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java @@ -3,7 +3,6 @@ package com.ruoyi.framework.listener; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.listener.SaTokenListener; import cn.dev33.satoken.stp.SaLoginModel; -import cn.dev33.satoken.stp.StpUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import com.ruoyi.common.constant.Constants; @@ -36,13 +35,12 @@ public class UserActionListener implements SaTokenListener { * 每次登录时触发 */ @Override - public void doLogin(String loginType, Object loginId, SaLoginModel loginModel) { + public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) { UserType userType = UserType.getUserType(loginId.toString()); if (userType == UserType.SYS_USER) { UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent")); String ip = ServletUtils.getClientIP(); LoginUser user = LoginHelper.getLoginUser(); - String tokenValue = StpUtil.getTokenValueByLoginId(loginId); UserOnlineDTO dto = new UserOnlineDTO(); dto.setIpaddr(ip); dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));