From 68e99f232e7497125258af61aac670bbac7fcd9a Mon Sep 17 00:00:00 2001 From: noear Date: Mon, 1 May 2023 09:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=85=A8=E5=B1=80=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=99=A8=E7=9A=84=20BeforeAuth=20=E8=AE=A4=E8=AF=81=E8=AE=BE?= =?UTF-8?q?=E4=B8=BA=E4=B8=8D=E5=8F=97=20includeList=20=E4=B8=8E=20exclude?= =?UTF-8?q?List=20=E7=9A=84=E9=99=90=E5=88=B6=EF=BC=8C=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E9=83=BD=E4=BC=9A=E8=BF=9B=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../satoken/solon/integration/SaTokenFilter.java | 3 ++- .../solon/integration/SaTokenInterceptor.java | 12 ++++++------ 2 files changed, 8 insertions(+), 7 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 7179865d..5331ab03 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 @@ -123,11 +123,12 @@ public class SaTokenFilter implements SaFilter, Filter { //之所以改名，为 Handler mainHandler = Solon.app().router().matchMain(ctx); Action action = (mainHandler instanceof Action ? (Action) mainHandler : null); - //先路径过滤下（包括了静态文件） //1.执行前置处理（主要是一些跨域之类的） if(beforeAuth != null) { beforeAuth.run(mainHandler); } + + //先路径过滤下（包括了静态文件） SaRouter.match(includeList).notMatch(excludeList).check(r -> { //2.执行注解处理 if(authAnno(action)) { 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 0afb5a82..a9554c76 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 @@ -172,19 +172,19 @@ public class SaTokenInterceptor implements RouterInterceptor { try { Action action = (mainHandler instanceof Action ? (Action) mainHandler : null); - //先路径过滤下（包括了静态文件） + //1.执行前置处理（主要是一些跨域之类的） + if(beforeAuth != null) { + beforeAuth.run(mainHandler); + } + + //先路径过滤下（不包括静态文件） SaRouter.match(includeList).notMatch(excludeList).check(r -> { - //1.执行前置处理（主要是一些跨域之类的） - if(beforeAuth != null) { - beforeAuth.run(mainHandler); - } //2.执行注解处理 if(authAnno(action)) { //3.执行规则处理（如果没有被 @SaIgnore 忽略） auth.run(mainHandler); } }); - } catch (StopMatchException e) { } catch (SaTokenException e) {