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