lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-06-28 13:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: 重构：isExtraData -> haveExtraData，以避免触发部分框架的自动序列化

Browse Source
This commit is contained in:
click33 2025-03-08 12:03:45 +08:00
parent 2b8489dff7
commit 7d2fac7d98
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sa-token-core/src/main/java/cn/dev33/satoken/session/SaTerminalInfo.java
View File

@ -116,7 +116,7 @@ public class SaTerminalInfo implements Serializable {
* 判断是否设置了扩展数据 * 判断是否设置了扩展数据
* @return / * @return /
*/ */
public boolean isSetExtraData() { public boolean haveExtraData() {
return extraData != null && !extraData.isEmpty(); return extraData != null && !extraData.isEmpty();
} }

4
sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginParameter.java
View File

@ -164,7 +164,7 @@ public class SaLoginParameter {
* 判断是否设置了扩展数据（只在jwt模式下生效） * 判断是否设置了扩展数据（只在jwt模式下生效）
* @return / * @return /
*/ */
public boolean isSetExtraData() { public boolean haveExtraData() {
return extraData != null && !extraData.isEmpty(); return extraData != null && !extraData.isEmpty();
} }
@ -198,7 +198,7 @@ public class SaLoginParameter {
* 判断是否设置了本次登录挂载到 SaTerminalInfo 的自定义扩展数据 * 判断是否设置了本次登录挂载到 SaTerminalInfo 的自定义扩展数据
* @return / * @return /
*/ */
public boolean isSetTerminalExtraData() { public boolean haveTerminalExtraData() {
return terminalExtraData != null && !terminalExtraData.isEmpty(); return terminalExtraData != null && !terminalExtraData.isEmpty();
} }

2
sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
View File

@ -586,7 +586,7 @@ public class StpLogic {
// 4、判断当前 StpLogic 是否支持 extra 扩展参数 // 4、判断当前 StpLogic 是否支持 extra 扩展参数
if( ! isSupportExtra()) { if( ! isSupportExtra()) {
// 如果不支持，开发者却传入了 extra 扩展参数，那么就打印警告信息 // 如果不支持，开发者却传入了 extra 扩展参数，那么就打印警告信息
if(loginParameter.isSetExtraData()) { if(loginParameter.haveExtraData()) {
SaManager.log.warn("当前 StpLogic 不支持 extra 扩展参数模式，传入的 extra 参数将被忽略"); SaManager.log.warn("当前 StpLogic 不支持 extra 扩展参数模式，传入的 extra 参数将被忽略");
} }
} }

1
sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
View File

@ -16,7 +16,6 @@ public class SaTokenApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(SaTokenApplication.class, args); SpringApplication.run(SaTokenApplication.class, args);
System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig()); System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
);
} }
} }

2
sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
View File

@ -75,7 +75,7 @@ public class TokenInfoTest {
SaLoginParameter lm = new SaLoginParameter().setExtraData(extraData); SaLoginParameter lm = new SaLoginParameter().setExtraData(extraData);
Assertions.assertEquals(lm.getExtraData(), extraData); Assertions.assertEquals(lm.getExtraData(), extraData);
Assertions.assertEquals(lm.getExtra("age"), 20); Assertions.assertEquals(lm.getExtra("age"), 20);
Assertions.assertTrue(lm.isSetExtraData()); Assertions.assertTrue(lm.haveExtraData());
Assertions.assertNotNull(lm.toString()); Assertions.assertNotNull(lm.toString());
// 计算 CookieTimeout // 计算 CookieTimeout