diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index 206c7760ba929112fe3f47e2ca4ace3b44227d8b..42d4148f46fd45b8b56c9222d03e6be89219e8ab 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -27,9 +27,9 @@ 3.0.9.RELEASE 2.3.34 3.2.1 - 1.8.2 + 1.8.5 3.2.139 - 4.0.20 + 4.0.50 4.9.17 3.14.4 1.1.5-java8 diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/SaBeanRegister.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/SaBeanRegister.java index be4aa73fd2843439af3229d378f44675d219c992..4943e9935719be8fc835eb302788696c5a5a14ad 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/SaBeanRegister.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/SaBeanRegister.java @@ -25,7 +25,7 @@ import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; import org.noear.solon.annotation.Inject; import org.noear.solon.core.handle.Filter; -import org.noear.solon.core.util.PathAnalyzer; +import org.noear.solon.core.util.PathMatcher; /** * 注册Sa-Token所需要的Bean @@ -39,7 +39,7 @@ public class SaBeanRegister { public SaBeanRegister() { // 重写路由匹配算法 SaStrategy.instance.routeMatcher = (pattern, path) -> { - return PathAnalyzer.get(pattern).matches(path); + return PathMatcher.get(pattern).matches(path); }; } diff --git a/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java b/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java index ad6588e6fe8612eaa9b7da0fea54f2a193ab727e..b5292ae0ae6a7a61a01c6986b9195976f6988e30 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java +++ b/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java @@ -2,9 +2,9 @@ package demo2; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpUtil; -import org.noear.solon.Solon; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; +import org.noear.solon.core.route.RouterInterceptor; /** * @author noear 2022/7/11 created @@ -39,8 +39,8 @@ public class Config { // } @Bean - public void saTokenPathInterceptor2() { - Solon.app().routerInterceptor((ctx, mainHandler, chain) -> { + public RouterInterceptor saTokenPathInterceptor2() { + return (ctx, mainHandler, chain) -> { SaRouter.match("/**", StpUtil::checkLogin); // 根据路由划分模块,不同模块不同鉴权 SaRouter.match("/user/**", r -> StpUtil.checkPermission("user")); @@ -49,6 +49,6 @@ public class Config { SaRouter.match("/orders/**", r -> StpUtil.checkPermission("orders")); chain.doIntercept(ctx, mainHandler); - }); + }; } }