From 4496242626946fa17ccfce8b9983a7e812ca0a63 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Mon, 22 May 2023 02:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=20StpLogic=20=E6=97=B6=E4=B8=8D=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=9C=A8=E5=85=A8=E5=B1=80=20SaManager=20=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java | 5 ++--- .../src/main/java/com/pj/satoken/StpUserUtil.java | 2 +- .../src/main/java/com/pj/SaTokenApplication.java | 2 +- .../src/main/java/com/pj/satoken/StpUserUtil.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java index 2b5f66f6..c930197c 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java @@ -35,6 +35,7 @@ import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpInterfaceDefaultImpl; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; +import cn.dev33.satoken.strategy.SaStrategy; import cn.dev33.satoken.temp.SaTempDefaultImpl; import cn.dev33.satoken.temp.SaTempInterface; import cn.dev33.satoken.util.SaFoxUtil; @@ -322,9 +323,7 @@ public class SaManager { synchronized (SaManager.class) { stpLogic = stpLogicMap.get(loginType); if(stpLogic == null) { - stpLogic = new StpLogic(loginType); - // 此处无需手动put,因为 StpLogic 构造方法中会自动put - // putStpLogic(stpLogic); + stpLogic = SaStrategy.me.createStpLogic.apply(loginType); } } } diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java index 23640c1c..d90cc967 100644 --- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java +++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java @@ -23,7 +23,7 @@ public class StpUserUtil { /** * 多账号体系下的类型标识 */ - public static final String TYPE = "login"; + public static final String TYPE = "user"; /** * 底层使用的 StpLogic 对象 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 08eaed43..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 @@ -14,7 +14,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class SaTokenApplication { public static void main(String[] args) { - SpringApplication.run(SaTokenApplication.class, args); + SpringApplication.run(SaTokenApplication.class, args); System.out.println("\n启动成功:Sa-Token配置如下:" + SaManager.getConfig()); } diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java index 23640c1c..d90cc967 100644 --- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java +++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java @@ -23,7 +23,7 @@ public class StpUserUtil { /** * 多账号体系下的类型标识 */ - public static final String TYPE = "login"; + public static final String TYPE = "user"; /** * 底层使用的 StpLogic 对象