diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml index 53b55bbe..2a73e17c 100644 --- a/sa-token-demo/sa-token-demo-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-solon/pom.xml @@ -18,7 +18,7 @@ org.noear solon-web - 1.7.5 + 1.8.0 diff --git a/sa-token-starter/sa-token-solon-plugin/pom.xml b/sa-token-starter/sa-token-solon-plugin/pom.xml index 159d28fb..0b8b1144 100644 --- a/sa-token-starter/sa-token-solon-plugin/pom.xml +++ b/sa-token-starter/sa-token-solon-plugin/pom.xml @@ -20,7 +20,7 @@ org.noear solon - 1.7.5 + 1.8.0 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 aff074e5..65823601 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 @@ -1,16 +1,11 @@ package cn.dev33.satoken.solon; import org.noear.solon.Solon; -import org.noear.solon.SolonApp; -import org.noear.solon.core.Aop; +import org.noear.solon.core.AopContext; import org.noear.solon.core.Plugin; import cn.dev33.satoken.SaManager; -import cn.dev33.satoken.annotation.SaCheckBasic; -import cn.dev33.satoken.annotation.SaCheckLogin; -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaCheckRole; -import cn.dev33.satoken.annotation.SaCheckSafe; +import cn.dev33.satoken.annotation.*; import cn.dev33.satoken.basic.SaBasicTemplate; import cn.dev33.satoken.basic.SaBasicUtil; import cn.dev33.satoken.config.SaTokenConfig; @@ -35,12 +30,12 @@ import cn.dev33.satoken.temp.SaTempInterface; public class XPluginImp implements Plugin { @Override - public void start(SolonApp app) { - Aop.context().beanAroundAdd(SaCheckPermission.class, SaTokenMethodInterceptor.INSTANCE); - Aop.context().beanAroundAdd(SaCheckRole.class, SaTokenMethodInterceptor.INSTANCE); - Aop.context().beanAroundAdd(SaCheckLogin.class, SaTokenMethodInterceptor.INSTANCE); - Aop.context().beanAroundAdd(SaCheckSafe.class, SaTokenMethodInterceptor.INSTANCE); - Aop.context().beanAroundAdd(SaCheckBasic.class, SaTokenMethodInterceptor.INSTANCE); + public void start(AopContext context) { + context.beanAroundAdd(SaCheckPermission.class, SaTokenMethodInterceptor.INSTANCE); + context.beanAroundAdd(SaCheckRole.class, SaTokenMethodInterceptor.INSTANCE); + context.beanAroundAdd(SaCheckLogin.class, SaTokenMethodInterceptor.INSTANCE); + context.beanAroundAdd(SaCheckSafe.class, SaTokenMethodInterceptor.INSTANCE); + context.beanAroundAdd(SaCheckBasic.class, SaTokenMethodInterceptor.INSTANCE); //集成初始化 @@ -51,67 +46,65 @@ public class XPluginImp implements Plugin { SaTokenConfig saTokenConfig = Solon.cfg().getBean("sa-token", SaTokenConfig.class); SaManager.setConfig(saTokenConfig); - Aop.getAsyn(SaTokenConfig.class, bw -> { + context.getWrapAsyn(SaTokenConfig.class, bw -> { SaManager.setConfig(bw.raw()); }); // 注入Dao Bean - Aop.getAsyn(SaTokenDao.class, bw -> { + context.getWrapAsyn(SaTokenDao.class, bw -> { SaManager.setSaTokenDao(bw.raw()); }); - // 注入二级上下文 Bean - Aop.getAsyn(SaTokenSecondContextCreator.class, bw->{ - SaTokenSecondContextCreator raw = bw.raw(); + // 注入二级上下文 Bean + context.getWrapAsyn(SaTokenSecondContextCreator.class, bw->{ + SaTokenSecondContextCreator raw = bw.raw(); SaManager.setSaTokenSecondContext(raw.create()); }); - + // 注入侦听器 Bean - Aop.getAsyn(SaTokenListener.class, bw->{ + context.getWrapAsyn(SaTokenListener.class, bw->{ SaManager.setSaTokenListener(bw.raw()); }); // 注入权限认证 Bean - Aop.getAsyn(StpInterface.class, bw->{ + context.getWrapAsyn(StpInterface.class, bw->{ SaManager.setStpInterface(bw.raw()); }); // 注入持久化 Bean - Aop.getAsyn(SaTokenDao.class, bw->{ + context.getWrapAsyn(SaTokenDao.class, bw->{ SaManager.setSaTokenDao(bw.raw()); }); // 临时令牌验证模块 Bean - Aop.getAsyn(SaTempInterface.class, bw->{ + context.getWrapAsyn(SaTempInterface.class, bw->{ SaManager.setSaTemp(bw.raw()); }); // Sa-Token-Id 身份凭证模块 Bean - Aop.getAsyn(SaIdTemplate.class, bw->{ - SaIdUtil.saIdTemplate = bw.raw(); + context.getWrapAsyn(SaIdTemplate.class, bw->{ + SaIdUtil.saIdTemplate = bw.raw(); }); - // Sa-Token Http Basic 认证模块 Bean - Aop.getAsyn(SaBasicTemplate.class, bw->{ - SaBasicUtil.saBasicTemplate = bw.raw(); + // Sa-Token Http Basic 认证模块 Bean + context.getWrapAsyn(SaBasicTemplate.class, bw->{ + SaBasicUtil.saBasicTemplate = bw.raw(); }); - // Sa-Token JSON 转换器 Bean - Aop.getAsyn(SaJsonTemplate.class, bw->{ - SaManager.setSaJsonTemplate(bw.raw()); + // Sa-Token JSON 转换器 Bean + context.getWrapAsyn(SaJsonTemplate.class, bw->{ + SaManager.setSaJsonTemplate(bw.raw()); }); - // Sa-Token 参数签名算法 Bean - Aop.getAsyn(SaSignTemplate.class, bw->{ - SaManager.setSaSignTemplate(bw.raw()); + // Sa-Token 参数签名算法 Bean + context.getWrapAsyn(SaSignTemplate.class, bw->{ + SaManager.setSaSignTemplate(bw.raw()); }); - // 自定义 StpLogic 对象 - Aop.getAsyn(StpLogic.class, bw->{ - StpUtil.setStpLogic(bw.raw()); + // 自定义 StpLogic 对象 + context.getWrapAsyn(StpLogic.class, bw->{ + StpUtil.setStpLogic(bw.raw()); }); - } - -} +} \ No newline at end of file