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/SolonPluginImpl.java similarity index 91% rename from sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java rename to sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/SolonPluginImpl.java index 0b3043bb..509012e2 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/SolonPluginImpl.java @@ -1,5 +1,10 @@ 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.Plugin; + import cn.dev33.satoken.SaManager; import cn.dev33.satoken.action.SaTokenAction; import cn.dev33.satoken.annotation.SaCheckLogin; @@ -8,24 +13,21 @@ import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.listener.SaTokenListener; -import cn.dev33.satoken.solon.integration.SaTokenMethodInterceptor; import cn.dev33.satoken.solon.integration.SaContextForSolon; +import cn.dev33.satoken.solon.integration.SaTokenMethodInterceptor; import cn.dev33.satoken.stp.StpInterface; -import org.noear.solon.Solon; -import org.noear.solon.SolonApp; -import org.noear.solon.core.Aop; -import org.noear.solon.core.Plugin; /** * @author noear * @since 1.4 */ -public class XPluginImp implements Plugin { - @Override +public class SolonPluginImpl 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(SaCheckPermission.class, SaTokenMethodInterceptor.INSTANCE); + Aop.context().beanAroundAdd(SaCheckRole.class, SaTokenMethodInterceptor.INSTANCE); + Aop.context().beanAroundAdd(SaCheckLogin.class, SaTokenMethodInterceptor.INSTANCE); //集成初始化 @@ -56,5 +58,6 @@ public class XPluginImp implements Plugin { Aop.getAsyn(SaTokenDao.class, bw->{ SaManager.setSaTokenDao(bw.raw()); }); + } } diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenMethodInterceptor.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenMethodInterceptor.java index 1987a32b..d18e737c 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenMethodInterceptor.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenMethodInterceptor.java @@ -9,7 +9,8 @@ import org.noear.solon.core.aspect.Invocation; * @since 1.4 */ public class SaTokenMethodInterceptor implements Interceptor { - public static final SaTokenMethodInterceptor instance = new SaTokenMethodInterceptor(); + + public static final SaTokenMethodInterceptor INSTANCE = new SaTokenMethodInterceptor(); @Override public Object doIntercept(Invocation inv) throws Throwable { diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathFilter.java index 86496da9..3db78d71 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathFilter.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathFilter.java @@ -17,6 +17,7 @@ import java.util.List; * @author noear 2021/5/30 created */ public class SaTokenPathFilter implements Filter { + // ------------------------ 设置此过滤器 拦截 & 放行 的路由 /** diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java index 396b7422..c98e7a77 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java @@ -8,8 +8,10 @@ import org.noear.solon.core.handle.Context; * @since 1.4 */ public class SaRequestForSolon implements SaRequest { - Context ctx; - public SaRequestForSolon(){ + + Context ctx; + + public SaRequestForSolon(){ ctx = Context.current(); } diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java index edfecc31..6f5d45e4 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java @@ -9,6 +9,7 @@ import org.noear.solon.core.handle.Context; * @since 1.4 */ public class SaResponseForSolon implements SaResponse { + Context ctx; public SaResponseForSolon() { diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaStorageForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaStorageForSolon.java index 6191f549..7fc04579 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaStorageForSolon.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaStorageForSolon.java @@ -8,7 +8,8 @@ import org.noear.solon.core.handle.Context; * @since 1.4 */ public class SaStorageForSolon implements SaStorage { - Context ctx; + + Context ctx; public SaStorageForSolon() { ctx = Context.current(); diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/resources/META-INF/solon/cn.dev33.satoken.solon.properties b/sa-token-starter/sa-token-solon-plugin/src/main/resources/META-INF/solon/cn.dev33.satoken.solon.properties index 51d8fd9a..9eb0954d 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/resources/META-INF/solon/cn.dev33.satoken.solon.properties +++ b/sa-token-starter/sa-token-solon-plugin/src/main/resources/META-INF/solon/cn.dev33.satoken.solon.properties @@ -1 +1 @@ -solon.plugin=cn.dev33.satoken.solon.XPluginImp \ No newline at end of file +solon.plugin=cn.dev33.satoken.solon.SolonPluginImpl \ No newline at end of file