整理pr

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());
         });
+        
     }
 }

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 {

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 {
+	
     // ------------------------ 设置此过滤器 拦截 & 放行 的路由
 
     /**

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();
     }
 

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() {

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();

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
+solon.plugin=cn.dev33.satoken.solon.SolonPluginImpl