!188 sa-token-solon-plugin：升级 solon 为 1.10.9

Merge pull request !188 from 西东/dev

pom.xml

@@ -50,7 +50,7 @@
 		<jackson-datatype-jsr310.version>2.11.2</jackson-datatype-jsr310.version>
 		<servlet-api.version>3.1.0</servlet-api.version>
 		<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
-		<solon.version>1.10.4</solon.version>
+		<solon.version>1.10.9</solon.version>
 		<solon-test.version>1.9.1</solon-test.version>
 		<noear-redisx.version>1.4.3</noear-redisx.version>
 		<jfinal.version>4.9.17</jfinal.version>

sa-token-demo/sa-token-demo-solon/pom.xml

@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>org.noear</groupId>
 			<artifactId>solon-web</artifactId>
-            <version>1.10.4</version>
+            <version>${solon.version}</version>
 		</dependency>
 		
 		<!-- Sa-Token 权限认证, 在线文档：https://sa-token.cc/ -->

sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java

@@ -5,12 +5,6 @@ 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.SaCheckDisable;
-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.basic.SaBasicTemplate;
 import cn.dev33.satoken.basic.SaBasicUtil;
 import cn.dev33.satoken.config.SaTokenConfig;
@@ -23,7 +17,6 @@ import cn.dev33.satoken.listener.SaTokenEventCenter;
 import cn.dev33.satoken.listener.SaTokenListener;
 import cn.dev33.satoken.same.SaSameTemplate;
 import cn.dev33.satoken.sign.SaSignTemplate;
-import cn.dev33.satoken.solon.integration.SaTokenAnnotationInterceptor;
 import cn.dev33.satoken.solon.model.SaContextForSolon;
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpLogic;
@@ -39,13 +32,6 @@ public class XPluginImp implements Plugin {
 
     @Override
     public void start(AopContext context) {
-        context.beanAroundAdd(SaCheckPermission.class, SaTokenAnnotationInterceptor.INSTANCE);
-        context.beanAroundAdd(SaCheckRole.class, SaTokenAnnotationInterceptor.INSTANCE);
-        context.beanAroundAdd(SaCheckLogin.class, SaTokenAnnotationInterceptor.INSTANCE);
-        context.beanAroundAdd(SaCheckSafe.class, SaTokenAnnotationInterceptor.INSTANCE);
-        context.beanAroundAdd(SaCheckDisable.class, SaTokenAnnotationInterceptor.INSTANCE);
-        context.beanAroundAdd(SaCheckBasic.class, SaTokenAnnotationInterceptor.INSTANCE);
-
         //集成初始化
 
         // 注入上下文Bean
@@ -55,20 +41,19 @@ public class XPluginImp implements Plugin {
         SaTokenConfig saTokenConfig = Solon.cfg().getBean("sa-token", SaTokenConfig.class);
         SaManager.setConfig(saTokenConfig);
 
-        context.getWrapAsyn(SaTokenConfig.class, bw -> {
+        context.getBeanAsyn(SaTokenConfig.class, bean -> {
-            SaManager.setConfig(bw.raw());
+            SaManager.setConfig(bean);
         });
 
 
         // 注入Dao Bean
-        context.getWrapAsyn(SaTokenDao.class, bw -> {
+        context.getBeanAsyn(SaTokenDao.class, bean -> {
-            SaManager.setSaTokenDao(bw.raw());
+            SaManager.setSaTokenDao(bean);
         });
 
         // 注入二级上下文 Bean
-        context.getWrapAsyn(SaTokenSecondContextCreator.class, bw->{
+        context.getBeanAsyn(SaTokenSecondContextCreator.class, bean -> {
-            SaTokenSecondContextCreator raw = bw.raw();
+            SaManager.setSaTokenSecondContext(bean.create());
-            SaManager.setSaTokenSecondContext(raw.create());
         });
 
         // 注入侦听器 Bean
@@ -78,49 +63,48 @@ public class XPluginImp implements Plugin {
 
 
         // 注入权限认证 Bean
-        context.getWrapAsyn(StpInterface.class, bw->{
+        context.getBeanAsyn(StpInterface.class, bean -> {
-            SaManager.setStpInterface(bw.raw());
+            SaManager.setStpInterface(bean);
         });
 
         // 注入持久化 Bean
-        context.getWrapAsyn(SaTokenDao.class, bw->{
+        context.getBeanAsyn(SaTokenDao.class, bean -> {
-            SaManager.setSaTokenDao(bw.raw());
+            SaManager.setSaTokenDao(bean);
         });
 
         // 临时令牌验证模块 Bean
-        context.getWrapAsyn(SaTempInterface.class, bw->{
+        context.getBeanAsyn(SaTempInterface.class, bean -> {
-            SaManager.setSaTemp(bw.raw());
+            SaManager.setSaTemp(bean);
         });
 
         // Sa-Token-Id 身份凭证模块 Bean
-        context.getWrapAsyn(SaIdTemplate.class, bw->{
+        context.getBeanAsyn(SaIdTemplate.class, bean -> {
-            SaIdUtil.saIdTemplate = bw.raw();
+            SaIdUtil.saIdTemplate = bean;
         });
 
         // Sa-Token Same-Token 模块 Bean
-        context.getWrapAsyn(SaSameTemplate.class, bw->{
+        context.getBeanAsyn(SaSameTemplate.class, bean -> {
-            SaManager.setSaSignTemplate(bw.raw());
+            SaManager.setSaSameTemplate(bean);
         });
 
         // Sa-Token Http Basic 认证模块 Bean
-        context.getWrapAsyn(SaBasicTemplate.class, bw->{
+        context.getBeanAsyn(SaBasicTemplate.class, bean -> {
-            SaBasicUtil.saBasicTemplate = bw.raw();
+            SaBasicUtil.saBasicTemplate = bean;
         });
 
         // Sa-Token JSON 转换器 Bean
-        context.getWrapAsyn(SaJsonTemplate.class, bw->{
+        context.getBeanAsyn(SaJsonTemplate.class, bean -> {
-            SaManager.setSaJsonTemplate(bw.raw());
+            SaManager.setSaJsonTemplate(bean);
         });
 
         // Sa-Token 参数签名算法 Bean
-        context.getWrapAsyn(SaSignTemplate.class, bw->{
+        context.getBeanAsyn(SaSignTemplate.class, bean -> {
-            SaManager.setSaSignTemplate(bw.raw());
+            SaManager.setSaSignTemplate(bean);
         });
 
         // 自定义 StpLogic 对象
-        context.getWrapAsyn(StpLogic.class, bw->{
+        context.getBeanAsyn(StpLogic.class, bean -> {
-            StpUtil.setStpLogic(bw.raw());
+            StpUtil.setStpLogic(bean);
         });
     }
-	
 }

sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenAnnotationInterceptor.java

@@ -1,40 +0,0 @@
-package cn.dev33.satoken.solon.integration;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import cn.dev33.satoken.strategy.SaStrategy;
-import org.noear.solon.core.aspect.Interceptor;
-import org.noear.solon.core.aspect.Invocation;
-import org.noear.solon.core.handle.Context;
-
-import java.lang.reflect.Method;
-
-/**
- * @author noear
- * @since 1.4
- * @deprecated 1.10，改用 SaTokenPathInterceptor
- */
-@Deprecated
-public class SaTokenAnnotationInterceptor implements Interceptor {
-
-    public static final SaTokenAnnotationInterceptor INSTANCE = new SaTokenAnnotationInterceptor();
-
-    @Override
-    public Object doIntercept(Invocation inv) throws Throwable {
-        // 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权
-        Context ctx = Context.current();
-
-        if (ctx != null && "1".equals(ctx.attr("_SaTokenPathInterceptor"))) {
-            // 执行原有逻辑
-            return inv.invoke();
-        } else {
-
-            Method method = inv.method().getMethod();
-            if (SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class) == false) {
-                SaStrategy.me.checkMethodAnnotation.accept(method);
-            }
-
-            // 执行原有逻辑
-            return inv.invoke();
-        }
-    }
-}

sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathFilter.java

@@ -1,30 +1,32 @@
 package cn.dev33.satoken.solon.integration;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.exception.BackResultException;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.exception.StopMatchException;
 import cn.dev33.satoken.filter.SaFilterAuthStrategy;
 import cn.dev33.satoken.filter.SaFilterErrorStrategy;
 import cn.dev33.satoken.router.SaRouter;
-import org.noear.solon.Utils;
+import cn.dev33.satoken.strategy.SaStrategy;
-import org.noear.solon.core.handle.Context;
+import org.noear.solon.Solon;
-import org.noear.solon.core.handle.Filter;
+import org.noear.solon.core.handle.*;
-import org.noear.solon.core.handle.FilterChain;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 /**
- * sa-token 基于路由的过滤式鉴权( +SaTokenAnnotationInterceptor )
+ * sa-token 基于路由的过滤式鉴权（增加了注解的处理）；使用优先级要低些
  *
  * @author noear
- * @since 1.9
+ * @since 1.10
- * @deprecated 1.10，改用 SaTokenPathInterceptor
- * @see SaTokenPathInterceptor
  */
-@Deprecated
 public class SaTokenPathFilter implements Filter {
+	/**
+	 * 是否打开注解鉴权
+	 */
+	public boolean isAnnotation = true;
 
 	// ------------------------ 设置此过滤器 拦截 & 放行 的路由
 
@@ -163,12 +165,32 @@ public class SaTokenPathFilter implements Filter {
 	@Override
 	public void doFilter(Context ctx, FilterChain chain) throws Throwable {
 		try {
-            // 执行全局过滤器
+			//查找当前主处理
-            SaRouter.match(includeList).notMatch(excludeList).check(r -> {
+			Handler mainHandler = Solon.app().router().matchMain(ctx);
-                beforeAuth.run(null);
-                auth.run(null);
-            });
 
+			//如果是静态文件，则不处理（静态文件，不在路由中）
+			if (mainHandler != null) {
+				Action action = (mainHandler instanceof Action ? (Action) mainHandler : null);
+
+				if (isAnnotation && action != null) {
+					// 获取此请求对应的 Method 处理函数
+					Method method = action.method().getMethod();
+
+					// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权
+					if (SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class)) {
+						return;
+					}
+
+					// 注解校验
+					SaStrategy.me.checkMethodAnnotation.accept(method);
+				}
+
+				//路径规则处理
+				SaRouter.match(includeList).notMatch(excludeList).check(r -> {
+					beforeAuth.run(mainHandler);
+					auth.run(mainHandler);
+				});
+			}
 		} catch (StopMatchException e) {
 
 		} catch (SaTokenException e) {
@@ -186,12 +208,8 @@ public class SaTokenPathFilter implements Filter {
 			}
 			ctx.setHandled(true);
 			return;
-        } catch (Throwable e) {
-            // 异常解包
-            throw Utils.throwableUnwrap(e); //solon 的最后层还有保底处理
 		}
 
-        // 执行
 		chain.doFilter(ctx);
 	}
 }

sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathInterceptor.java

@@ -18,10 +18,8 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * sa-token 基于路由的拦截式鉴权（增加了注解的处理）
+ * sa-token 基于路由的拦截式鉴权（增加了注解的处理）；使用优先级要高些
  *
- * @author kong
- * @since 1.9
  * @author noear
  * @since 1.10
  */
@@ -172,8 +170,6 @@ public class SaTokenPathInterceptor implements Handler {
 			Action action = ctx.action();
 
 			if(isAnnotation && action != null){
-				ctx.attrSet("_SaTokenPathInterceptor", "1");
-
 				// 获取此请求对应的 Method 处理函数
 				Method method = action.method().getMethod();
 
@@ -184,8 +180,6 @@ public class SaTokenPathInterceptor implements Handler {
 
 				// 注解校验
 				SaStrategy.me.checkMethodAnnotation.accept(method);
-			}else{
-				ctx.attrSet("_SaTokenPathInterceptor", "0");
 			}
 
 			//路径规则处理