From 7d2fac7d98fcc5b82cf823341174ccdfc959413c Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Sat, 8 Mar 2025 12:03:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=EF=BC=9AisExtraD?= =?UTF-8?q?ata=20->=20haveExtraData=EF=BC=8C=E4=BB=A5=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E9=83=A8=E5=88=86=E6=A1=86=E6=9E=B6=E7=9A=84?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/dev33/satoken/session/SaTerminalInfo.java | 2 +- .../src/main/java/cn/dev33/satoken/stp/SaLoginParameter.java | 4 ++-- .../src/main/java/cn/dev33/satoken/stp/StpLogic.java | 2 +- .../src/main/java/com/pj/SaTokenApplication.java | 1 - .../test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaTerminalInfo.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaTerminalInfo.java index f41cd1ea..e2e5bb60 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaTerminalInfo.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaTerminalInfo.java @@ -116,7 +116,7 @@ public class SaTerminalInfo implements Serializable { * 判断是否设置了扩展数据 * @return / */ - public boolean isSetExtraData() { + public boolean haveExtraData() { return extraData != null && !extraData.isEmpty(); } diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginParameter.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginParameter.java index e7e571fa..d79162f8 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginParameter.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginParameter.java @@ -164,7 +164,7 @@ public class SaLoginParameter { * 判断是否设置了扩展数据(只在jwt模式下生效) * @return / */ - public boolean isSetExtraData() { + public boolean haveExtraData() { return extraData != null && !extraData.isEmpty(); } @@ -198,7 +198,7 @@ public class SaLoginParameter { * 判断是否设置了本次登录挂载到 SaTerminalInfo 的自定义扩展数据 * @return / */ - public boolean isSetTerminalExtraData() { + public boolean haveTerminalExtraData() { return terminalExtraData != null && !terminalExtraData.isEmpty(); } diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java index 9fbf66a1..c14ec1f3 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java @@ -586,7 +586,7 @@ public class StpLogic { // 4、判断当前 StpLogic 是否支持 extra 扩展参数 if( ! isSupportExtra()) { // 如果不支持,开发者却传入了 extra 扩展参数,那么就打印警告信息 - if(loginParameter.isSetExtraData()) { + if(loginParameter.haveExtraData()) { SaManager.log.warn("当前 StpLogic 不支持 extra 扩展参数模式,传入的 extra 参数将被忽略"); } } diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java index b3e9e28f..90c20522 100644 --- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java +++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java @@ -16,7 +16,6 @@ public class SaTokenApplication { public static void main(String[] args) { SpringApplication.run(SaTokenApplication.class, args); System.out.println("\n启动成功:Sa-Token配置如下:" + SaManager.getConfig()); - ); } } diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java index 496fa363..a1a9ba36 100644 --- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java +++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java @@ -75,7 +75,7 @@ public class TokenInfoTest { SaLoginParameter lm = new SaLoginParameter().setExtraData(extraData); Assertions.assertEquals(lm.getExtraData(), extraData); Assertions.assertEquals(lm.getExtra("age"), 20); - Assertions.assertTrue(lm.isSetExtraData()); + Assertions.assertTrue(lm.haveExtraData()); Assertions.assertNotNull(lm.toString()); // 计算 CookieTimeout