From 637781415a72c38375e26b6420ec6d64d6786f27 Mon Sep 17 00:00:00 2001 From: noear Date: Wed, 16 Nov 2022 15:20:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?sa-token-solon-plugin=EF=BC=9A=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=80=82=E9=85=8D=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E6=B2=A1=E6=9C=89sa-token=E9=85=8D=E7=BD=AE=E5=86=85?= =?UTF-8?q?=E5=AE=B9=EF=BC=88=E7=BB=99=E4=B8=AA=E9=BB=98=E8=AE=A4=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AE=9E=E4=BE=8B=EF=BC=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/dev33/satoken/solon/XPluginImp.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java index 7f4aed39..08b3672d 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java @@ -35,19 +35,25 @@ public class XPluginImp implements Plugin { public void start(AopContext context) { // Sa-Token 日志输出 Bean context.getBeanAsync(SaLog.class, bean -> { - SaManager.setLog(bean); + SaManager.setLog(bean); }); //注入其它 Bean - context.beanOnloaded(c->{ + context.beanOnloaded(c -> { beanInitDo(c); }); } - private void beanInitDo(AopContext context){ + private void beanInitDo(AopContext context) { //注入配置Bean SaTokenConfig saTokenConfig = Solon.cfg().getBean("sa-token", SaTokenConfig.class); + if (saTokenConfig != null) { + //如果没有，给个默认的 + saTokenConfig = new SaTokenConfig(); + saTokenConfig.setIsPrint(false); + } + SaManager.setConfig(saTokenConfig); context.getBeanAsync(SaTokenConfig.class, bean -> { From c2ad8bf347b0c3be88a0133c3efd381fe39b4bdd Mon Sep 17 00:00:00 2001 From: noear Date: Wed, 16 Nov 2022 15:24:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?sa-token-solon-plugin=EF=BC=9A=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=80=82=E9=85=8D=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E6=B2=A1=E6=9C=89sa-token=E9=85=8D=E7=BD=AE=E5=86=85?= =?UTF-8?q?=E5=AE=B9=EF=BC=88=E7=BB=99=E4=B8=AA=E9=BB=98=E8=AE=A4=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AE=9E=E4=BE=8B=EF=BC=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/dev33/satoken/solon/XPluginImp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java index 08b3672d..8cb0d44a 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java @@ -48,7 +48,7 @@ public class XPluginImp implements Plugin { private void beanInitDo(AopContext context) { //注入配置Bean SaTokenConfig saTokenConfig = Solon.cfg().getBean("sa-token", SaTokenConfig.class); - if (saTokenConfig != null) { + if (saTokenConfig == null) { //如果没有，给个默认的 saTokenConfig = new SaTokenConfig(); saTokenConfig.setIsPrint(false); From 59eaed193bf8d894808594929066a8f815caab00 Mon Sep 17 00:00:00 2001 From: noear Date: Wed, 16 Nov 2022 15:38:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?sa-token-solon-plugin=EF=BC=9A=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=80=82=E9=85=8D=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E6=B2=A1=E6=9C=89sa-token=E9=85=8D=E7=BD=AE=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/dev33/satoken/solon/XPluginImp.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java index 8cb0d44a..76327612 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java @@ -46,23 +46,19 @@ public class XPluginImp implements Plugin { } private void beanInitDo(AopContext context) { + // 注入上下文Bean + SaManager.setSaTokenContext(new SaContextForSolon()); + //注入配置Bean SaTokenConfig saTokenConfig = Solon.cfg().getBean("sa-token", SaTokenConfig.class); - if (saTokenConfig == null) { - //如果没有，给个默认的 - saTokenConfig = new SaTokenConfig(); - saTokenConfig.setIsPrint(false); + if (saTokenConfig != null) { + SaManager.setConfig(saTokenConfig); } - SaManager.setConfig(saTokenConfig); - context.getBeanAsync(SaTokenConfig.class, bean -> { SaManager.setConfig(bean); }); - // 注入上下文Bean - SaManager.setSaTokenContext(new SaContextForSolon()); - // 注入Dao Bean context.getBeanAsync(SaTokenDao.class, bean -> { SaManager.setSaTokenDao(bean);