From 40367884262221bd86a1612ce7edb680d20a3566 Mon Sep 17 00:00:00 2001 From: noear Date: Tue, 29 Jul 2025 11:19:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20sa-token-solon-plugin=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=20Gateway=20=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=88=E9=81=BF=E5=85=8D=E4=BD=BF=E7=94=A8=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E6=8E=A5=E5=8F=A3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/dev33/satoken/solon/integration/SaTokenFilter.java | 6 ++---- .../dev33/satoken/solon/integration/SaTokenInterceptor.java | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java index 4d1324ee..cc75e87f 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java @@ -26,7 +26,6 @@ import cn.dev33.satoken.solon.util.SaSolonOperateUtil; import cn.dev33.satoken.strategy.SaAnnotationStrategy; import org.noear.solon.Solon; import org.noear.solon.core.handle.*; -import org.noear.solon.core.route.RoutingTable; import java.lang.reflect.Method; import java.util.ArrayList; @@ -161,10 +160,9 @@ public class SaTokenFilter implements SaFilter, Filter { //之所以改名，为 if (mainHandler instanceof Gateway) { //支持网关处理 Gateway gateway = (Gateway) mainHandler; - RoutingTable mainRouting = gateway.getMainRouting(); - MethodType method = MethodTypeUtil.valueOf(ctx.method()); - mainHandler = mainRouting.matchOne(ctx.pathNew(), method); + mainHandler = gateway.find(ctx); } + Action action = (mainHandler instanceof Action ? (Action) mainHandler : null); //1.执行前置处理（主要是一些跨域之类的） diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java index 6942a209..bfe6587c 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java @@ -27,7 +27,6 @@ import cn.dev33.satoken.strategy.SaAnnotationStrategy; import org.noear.solon.core.handle.*; import org.noear.solon.core.route.RouterInterceptor; import org.noear.solon.core.route.RouterInterceptorChain; -import org.noear.solon.core.route.RoutingTable; import java.lang.reflect.Method; import java.util.ArrayList; @@ -197,9 +196,7 @@ public class SaTokenInterceptor implements SaFilter, RouterInterceptor { if (mainHandler instanceof Gateway) { //支持网关处理 Gateway gateway = (Gateway) mainHandler; - RoutingTable mainRouting = gateway.getMainRouting(); - MethodType method = MethodTypeUtil.valueOf(ctx.method()); - mainHandler = mainRouting.matchOne(ctx.pathNew(), method); + mainHandler = gateway.find(ctx); } Action action = (mainHandler instanceof Action ? (Action) mainHandler : null);