From 02b55b7665816cc4e9d366b5cd562c65cffed3eb Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Sat, 22 Oct 2022 05:18:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=AE=9A=E4=B9=89=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 17 +++++++ .../sa-token-demo-alone-redis/pom.xml | 10 ++-- sa-token-demo/sa-token-demo-case/pom.xml | 8 +-- .../sa-token-demo-dubbo-consumer/pom.xml | 8 +-- .../sa-token-demo-dubbo-provider/pom.xml | 8 +-- sa-token-demo/sa-token-demo-grpc/pom.xml | 8 +-- sa-token-demo/sa-token-demo-jwt/pom.xml | 10 ++-- .../sa-token-demo-oauth2-client/pom.xml | 6 +-- .../sa-token-demo-oauth2-server/pom.xml | 10 ++-- .../sa-token-demo-quick-login/pom.xml | 8 +-- sa-token-demo/sa-token-demo-solon/pom.xml | 12 ++--- .../sa-token-demo-springboot-redis/pom.xml | 10 ++-- .../sa-token-demo-springboot/pom.xml | 8 +-- .../sa-token-demo-sso-server/pom.xml | 10 ++-- .../sa-token-demo-sso1-client/pom.xml | 12 ++--- .../sa-token-demo-sso2-client/pom.xml | 12 ++--- .../sa-token-demo-sso3-client/pom.xml | 10 ++-- sa-token-demo/sa-token-demo-test/pom.xml | 10 ++-- sa-token-demo/sa-token-demo-thymeleaf/pom.xml | 8 +-- sa-token-demo/sa-token-demo-webflux/pom.xml | 10 ++-- .../sa-token-demo-websocket-spring/pom.xml | 8 +-- sa-token-demo/sa-token-demo-websocket/pom.xml | 8 +-- sa-token-plugin/sa-token-alone-redis/pom.xml | 2 +- .../sa-token-context-dubbo/pom.xml | 2 +- sa-token-plugin/sa-token-context-grpc/pom.xml | 2 +- sa-token-plugin/sa-token-dao-redisx/pom.xml | 4 +- .../sa-token-dialect-thymeleaf/pom.xml | 4 +- sa-token-plugin/sa-token-jwt/pom.xml | 2 +- sa-token-plugin/sa-token-quick-login/pom.xml | 2 +- sa-token-plugin/sa-token-spring-aop/pom.xml | 2 +- sa-token-plugin/sa-token-temp-jwt/pom.xml | 4 +- .../sa-token-jboot-plugin/pom.xml | 2 +- .../sa-token-jfinal-plugin/pom.xml | 2 +- .../pom.xml | 51 ++++++++++--------- sa-token-starter/sa-token-servlet/pom.xml | 5 +- .../sa-token-solon-plugin/pom.xml | 12 ++--- .../cn/dev33/satoken/solon/XPluginImp.java | 2 +- .../src/test/java/demo/Config.java | 10 ++-- .../sa-token-spring-boot-starter/pom.xml | 23 +++++---- 39 files changed, 186 insertions(+), 156 deletions(-) diff --git a/pom.xml b/pom.xml index dd1b01c9..894d9f3c 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,23 @@ 1.8 utf-8 utf-8 + + 2.5.12 + 5.0.4.RELEASE + 3.1.4.RELEASE + 2.12.6.1 + 3.1.0 + 3.0.9.RELEASE + 1.10.4 + 1.9.1 + 1.4.3 + 4.9.17 + 3.14.4 + 2.5.0 + 2.7.15 + 2.10.1.RELEASE + 5.8.5 + 0.9.1 diff --git a/sa-token-demo/sa-token-demo-alone-redis/pom.xml b/sa-token-demo/sa-token-demo-alone-redis/pom.xml index 18112cde..7f2a6067 100644 --- a/sa-token-demo/sa-token-demo-alone-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-alone-redis/pom.xml @@ -14,9 +14,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -35,14 +35,14 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} @@ -55,7 +55,7 @@ cn.dev33 sa-token-alone-redis - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-case/pom.xml b/sa-token-demo/sa-token-demo-case/pom.xml index fc713fb2..25e66d42 100644 --- a/sa-token-demo/sa-token-demo-case/pom.xml +++ b/sa-token-demo/sa-token-demo-case/pom.xml @@ -15,9 +15,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -36,14 +36,14 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml index 1d4c4656..50cd6ad8 100644 --- a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml @@ -16,7 +16,7 @@ 1.8 3.1.1 - 1.31.1.temp + 1.31.1.temp @@ -31,14 +31,14 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} org.apache.commons @@ -68,7 +68,7 @@ cn.dev33 sa-token-context-dubbo - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml index c58b1117..91f59c8e 100644 --- a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml @@ -16,7 +16,7 @@ 1.8 3.1.1 - 1.31.1.temp + 1.31.1.temp @@ -31,14 +31,14 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} org.apache.commons @@ -68,7 +68,7 @@ cn.dev33 sa-token-context-dubbo - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-grpc/pom.xml b/sa-token-demo/sa-token-demo-grpc/pom.xml index bf69b928..c14c9ef8 100644 --- a/sa-token-demo/sa-token-demo-grpc/pom.xml +++ b/sa-token-demo/sa-token-demo-grpc/pom.xml @@ -27,7 +27,7 @@ UTF-8 UTF-8 1.18.10 - 1.31.1.temp + 1.31.1.temp @@ -54,17 +54,17 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-context-grpc - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml index d0b5b6a0..ce2cf50e 100644 --- a/sa-token-demo/sa-token-demo-jwt/pom.xml +++ b/sa-token-demo/sa-token-demo-jwt/pom.xml @@ -14,9 +14,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -31,21 +31,21 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-jwt - ${sa-token-version} + ${sa-token.version} - 1.31.1.temp + + 1.31.1.temp @@ -32,7 +32,7 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml b/sa-token-demo/sa-token-demo-oauth2-server/pom.xml index a4e8beb9..86244fc9 100644 --- a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml +++ b/sa-token-demo/sa-token-demo-oauth2-server/pom.xml @@ -16,8 +16,8 @@ 1.8 3.1.1 - - 1.31.1.temp + + 1.31.1.temp @@ -32,21 +32,21 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-oauth2 - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} org.apache.commons diff --git a/sa-token-demo/sa-token-demo-quick-login/pom.xml b/sa-token-demo/sa-token-demo-quick-login/pom.xml index 42e01ad3..6c7fd685 100644 --- a/sa-token-demo/sa-token-demo-quick-login/pom.xml +++ b/sa-token-demo/sa-token-demo-quick-login/pom.xml @@ -14,9 +14,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -31,14 +31,14 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-quick-login - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml index 26c88b5c..ebd39d18 100644 --- a/sa-token-demo/sa-token-demo-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-solon/pom.xml @@ -7,9 +7,9 @@ 0.0.1-SNAPSHOT - + - 1.31.1.temp + 1.31.1.temp @@ -25,21 +25,21 @@ cn.dev33 sa-token-solon-plugin - ${sa-token-version} + ${sa-token.version} @@ -52,7 +52,7 @@ diff --git a/sa-token-demo/sa-token-demo-springboot-redis/pom.xml b/sa-token-demo/sa-token-demo-springboot-redis/pom.xml index 49fa16a4..b066e57d 100644 --- a/sa-token-demo/sa-token-demo-springboot-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot-redis/pom.xml @@ -15,9 +15,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -36,21 +36,21 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml index b5fdd415..2dd3f1ea 100644 --- a/sa-token-demo/sa-token-demo-springboot/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot/pom.xml @@ -15,9 +15,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -36,14 +36,14 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-sso-server/pom.xml b/sa-token-demo/sa-token-demo-sso-server/pom.xml index 8f8fcea6..1c5d2c21 100644 --- a/sa-token-demo/sa-token-demo-sso-server/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-server/pom.xml @@ -14,9 +14,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -31,21 +31,21 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-sso - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} org.apache.commons diff --git a/sa-token-demo/sa-token-demo-sso1-client/pom.xml b/sa-token-demo/sa-token-demo-sso1-client/pom.xml index afac6355..c98dd7bd 100644 --- a/sa-token-demo/sa-token-demo-sso1-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso1-client/pom.xml @@ -14,9 +14,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -31,21 +31,21 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-sso - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} @@ -58,7 +58,7 @@ cn.dev33 sa-token-alone-redis - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-sso2-client/pom.xml b/sa-token-demo/sa-token-demo-sso2-client/pom.xml index 5aa3882c..b98d79c2 100644 --- a/sa-token-demo/sa-token-demo-sso2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso2-client/pom.xml @@ -14,9 +14,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -31,21 +31,21 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-sso - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} @@ -58,7 +58,7 @@ cn.dev33 sa-token-alone-redis - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-sso3-client/pom.xml b/sa-token-demo/sa-token-demo-sso3-client/pom.xml index 365eaa7c..31224e47 100644 --- a/sa-token-demo/sa-token-demo-sso3-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso3-client/pom.xml @@ -14,9 +14,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -31,21 +31,21 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-sso - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-test/pom.xml b/sa-token-demo/sa-token-demo-test/pom.xml index b4c7e569..1dbc211a 100644 --- a/sa-token-demo/sa-token-demo-test/pom.xml +++ b/sa-token-demo/sa-token-demo-test/pom.xml @@ -15,9 +15,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -36,21 +36,21 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dao-redis-jackson - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml index de1c725d..7b756a07 100644 --- a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml +++ b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml @@ -14,9 +14,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -41,14 +41,14 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} cn.dev33 sa-token-dialect-thymeleaf - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml index e3f7d5ad..3f1414b4 100644 --- a/sa-token-demo/sa-token-demo-webflux/pom.xml +++ b/sa-token-demo/sa-token-demo-webflux/pom.xml @@ -14,9 +14,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -35,21 +35,21 @@ cn.dev33 sa-token-reactor-spring-boot-starter - ${sa-token-version} + ${sa-token.version} diff --git a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml index 5978ac6b..2be2ce3c 100644 --- a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml +++ b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml @@ -15,9 +15,9 @@ - + - 1.31.1.temp + 1.31.1.temp @@ -42,14 +42,14 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} + - 1.31.1.temp + 1.31.1.temp @@ -42,14 +42,14 @@ cn.dev33 sa-token-spring-boot-starter - ${sa-token-version} + ${sa-token.version} org.springframework.boot spring-boot-configuration-processor - 2.5.12 + ${springboot.version} true diff --git a/sa-token-plugin/sa-token-jwt/pom.xml b/sa-token-plugin/sa-token-jwt/pom.xml index bdaf04ef..a43ed8f1 100644 --- a/sa-token-plugin/sa-token-jwt/pom.xml +++ b/sa-token-plugin/sa-token-jwt/pom.xml @@ -27,7 +27,7 @@ cn.hutool hutool-jwt - 5.8.5 + ${hutool-jwt.version} diff --git a/sa-token-plugin/sa-token-quick-login/pom.xml b/sa-token-plugin/sa-token-quick-login/pom.xml index 121bd159..5bf1f1ad 100644 --- a/sa-token-plugin/sa-token-quick-login/pom.xml +++ b/sa-token-plugin/sa-token-quick-login/pom.xml @@ -27,7 +27,7 @@ org.springframework.boot spring-boot-starter-thymeleaf - 2.5.12 + ${springboot.version} diff --git a/sa-token-plugin/sa-token-spring-aop/pom.xml b/sa-token-plugin/sa-token-spring-aop/pom.xml index 3b08c64c..9475a39b 100644 --- a/sa-token-plugin/sa-token-spring-aop/pom.xml +++ b/sa-token-plugin/sa-token-spring-aop/pom.xml @@ -27,7 +27,7 @@ org.springframework.boot spring-boot-starter-aop - 2.5.12 + ${springboot.version} diff --git a/sa-token-plugin/sa-token-temp-jwt/pom.xml b/sa-token-plugin/sa-token-temp-jwt/pom.xml index 7fe0a32f..3ac777a6 100644 --- a/sa-token-plugin/sa-token-temp-jwt/pom.xml +++ b/sa-token-plugin/sa-token-temp-jwt/pom.xml @@ -27,13 +27,13 @@ io.jsonwebtoken jjwt - 0.9.1 + ${jjwt.version} diff --git a/sa-token-starter/sa-token-jboot-plugin/pom.xml b/sa-token-starter/sa-token-jboot-plugin/pom.xml index 685064ee..9a09461a 100644 --- a/sa-token-starter/sa-token-jboot-plugin/pom.xml +++ b/sa-token-starter/sa-token-jboot-plugin/pom.xml @@ -24,7 +24,7 @@ io.jboot jboot - 3.14.4 + ${jboot.version} provided diff --git a/sa-token-starter/sa-token-jfinal-plugin/pom.xml b/sa-token-starter/sa-token-jfinal-plugin/pom.xml index 8604009c..6ac0c80b 100644 --- a/sa-token-starter/sa-token-jfinal-plugin/pom.xml +++ b/sa-token-starter/sa-token-jfinal-plugin/pom.xml @@ -32,7 +32,7 @@ com.jfinal jfinal - 4.9.17 + ${jfinal.version} provided diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml b/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml index 8c69cb3c..c3132617 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml +++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml @@ -23,27 +23,47 @@ sa-token-core ${revision} - + + org.springframework.boot spring-boot-starter - 2.5.12 + ${springboot.version} true - + + org.springframework spring-web - 5.0.4.RELEASE + ${spring-web.version} true - + + io.projectreactor reactor-core - 3.1.4.RELEASE + ${reactor-core.version} true + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + true + + + + + org.springframework.boot + spring-boot-configuration-processor + ${springboot.version} + true + + cn.dev33 @@ -51,6 +71,7 @@ ${revision} true + cn.dev33 @@ -59,26 +80,10 @@ true - - - com.fasterxml.jackson.core - jackson-databind - 2.12.6.1 - true - - - - - org.springframework.boot - spring-boot-configuration-processor - 2.5.12 - true - - diff --git a/sa-token-starter/sa-token-servlet/pom.xml b/sa-token-starter/sa-token-servlet/pom.xml index 04f508b9..ed2f4aa7 100644 --- a/sa-token-starter/sa-token-servlet/pom.xml +++ b/sa-token-starter/sa-token-servlet/pom.xml @@ -23,11 +23,12 @@ sa-token-core ${revision} - + + javax.servlet javax.servlet-api - 3.1.0 + ${servlet-api.version} true diff --git a/sa-token-starter/sa-token-solon-plugin/pom.xml b/sa-token-starter/sa-token-solon-plugin/pom.xml index 1b1ac43f..ea599bd7 100644 --- a/sa-token-starter/sa-token-solon-plugin/pom.xml +++ b/sa-token-starter/sa-token-solon-plugin/pom.xml @@ -17,17 +17,17 @@ solon integrate sa-token - - org.noear - solon - 1.10.4 - - cn.dev33 sa-token-core ${revision} + + + org.noear + solon + ${solon.version} + \ No newline at end of file diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java index 26b91cac..7991d65b 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java @@ -3,7 +3,6 @@ package cn.dev33.satoken.solon; import org.noear.solon.Solon; import org.noear.solon.core.AopContext; import org.noear.solon.core.Plugin; -import org.noear.solon.core.event.EventBus; import cn.dev33.satoken.SaManager; import cn.dev33.satoken.annotation.SaCheckBasic; @@ -34,6 +33,7 @@ import cn.dev33.satoken.temp.SaTempInterface; * @author noear * @since 1.4 */ +@SuppressWarnings("deprecation") public class XPluginImp implements Plugin { @Override diff --git a/sa-token-starter/sa-token-solon-plugin/src/test/java/demo/Config.java b/sa-token-starter/sa-token-solon-plugin/src/test/java/demo/Config.java index 8bd221b1..0002d8f0 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/test/java/demo/Config.java +++ b/sa-token-starter/sa-token-solon-plugin/src/test/java/demo/Config.java @@ -1,19 +1,21 @@ package demo; -import cn.dev33.satoken.router.SaRouter; -import cn.dev33.satoken.solon.integration.SaTokenPathFilter; -import cn.dev33.satoken.stp.StpUtil; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; import org.noear.solon.core.handle.Filter; +import cn.dev33.satoken.router.SaRouter; +import cn.dev33.satoken.solon.integration.SaTokenPathFilter; +import cn.dev33.satoken.stp.StpUtil; + /** * @author noear 2022/3/30 created */ +@SuppressWarnings("deprecation") @Configuration public class Config { - @Bean + @Bean public Filter saTokenFilter() { return new SaTokenPathFilter() // 指定 [拦截路由] 与 [放行路由] diff --git a/sa-token-starter/sa-token-spring-boot-starter/pom.xml b/sa-token-starter/sa-token-spring-boot-starter/pom.xml index 72746940..4d26ef46 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/pom.xml +++ b/sa-token-starter/sa-token-spring-boot-starter/pom.xml @@ -17,16 +17,28 @@ springboot integrate sa-token + cn.dev33 sa-token-servlet ${revision} + + org.springframework.boot spring-boot-starter-web - 2.5.12 + ${springboot.version} + + + + org.springframework.boot + spring-boot-configuration-processor + ${springboot.version} + true + + cn.dev33 @@ -34,6 +46,7 @@ ${revision} true + cn.dev33 @@ -41,14 +54,6 @@ ${revision} true - - - - org.springframework.boot - spring-boot-configuration-processor - 2.5.12 - true -