diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java index c21dc90f..3362b5f0 100644 --- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java +++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java @@ -23,10 +23,11 @@ import cn.dev33.satoken.exception.SaTokenException; import cn.dev33.satoken.jwt.error.SaJwtErrorCode; import cn.dev33.satoken.jwt.exception.SaJwtException; import cn.dev33.satoken.session.SaSession; -import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.stp.SaTokenInfo; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; +import cn.dev33.satoken.stp.parameter.SaLoginParameter; +import cn.dev33.satoken.stp.parameter.SaLogoutParameter; import cn.dev33.satoken.util.SaFoxUtil; import cn.dev33.satoken.util.SaTokenConsts; @@ -136,34 +137,20 @@ public class StpLogicJwtForMixin extends StpLogic { } /** - * [禁用] 会话注销,根据账号id 和 设备类型 + * [work] 注销下线 + * + * @param tokenValue 指定 token + * @param logoutParameter 注销参数 */ - @Override - public void logout(Object loginId, String deviceType) { - throw new ApiDisabledException(); - } - - /** - * [禁用] 会话注销,根据指定 Token - */ - @Override - public void logoutByTokenValue(String tokenValue) { - throw new ApiDisabledException(); + public void _logoutByTokenValue(String tokenValue, SaLogoutParameter logoutParameter) { + throw new ApiDisabledException(); } /** - * [禁用] 踢人下线,根据账号id 和 设备类型 + * [禁用] 会话注销 */ @Override - public void kickout(Object loginId, String deviceType) { - throw new ApiDisabledException(); - } - - /** - * [禁用] 踢人下线,根据指定 Token - */ - @Override - public void kickoutByTokenValue(String tokenValue) { + public void _logout(Object loginId, SaLogoutParameter logoutParameter) { throw new ApiDisabledException(); } diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java index 63251d0d..13212796 100644 --- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java +++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java @@ -26,9 +26,9 @@ import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.spring.SpringMVCUtil; import cn.dev33.satoken.spring.pathmatch.SaPathMatcherHolder; import cn.dev33.satoken.stp.SaLoginConfig; -import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; +import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.util.SaTokenConsts; import cn.dev33.satoken.util.SoMap; import org.junit.jupiter.api.AfterAll; @@ -253,14 +253,15 @@ public class BasicsTest { // 测试:根据token强制注销 @Test public void testLogoutByToken() { + StpUtil.logout(10001); - // 先登录上 - StpUtil.login(10001); + // 先登录上 + StpUtil.login(10001); Assertions.assertTrue(StpUtil.isLogin()); String token = StpUtil.getTokenValue(); // 根据token注销 - StpUtil.logoutByTokenValue(token); + StpUtil.logoutByTokenValue(token); Assertions.assertFalse(StpUtil.isLogin()); // token 应该被清除 diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java index 33440b41..302f9e11 100644 --- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java +++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java @@ -57,7 +57,7 @@ public class ManyLoginTest { // 测试:并发登录、共享token、同端 @Test public void login() { - SaManager.setConfig(new SaTokenConfig()); + SaManager.setConfig(new SaTokenConfig().setIsShare(true)); StpUtil.login(10001); String token1 = StpUtil.getTokenValue();