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..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 @@ -35,28 +35,30 @@ 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 + SaManager.setSaTokenContext(new SaContextForSolon()); + //注入配置Bean SaTokenConfig saTokenConfig = Solon.cfg().getBean("sa-token", SaTokenConfig.class); - SaManager.setConfig(saTokenConfig); + if (saTokenConfig != null) { + 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);