diff --git a/README.md b/README.md index 7b5311c4a..e85ba80b5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.33.0

+

Sa-Token v1.34.0

一个轻量级 Java 权限认证框架,让鉴权变得简单、优雅!

diff --git a/mvn clean.bat b/mvn clean.bat index 5646ce05a..c15f651fb 100644 --- a/mvn clean.bat +++ b/mvn clean.bat @@ -6,6 +6,8 @@ call mvn clean cd sa-token-demo cd sa-token-demo-alone-redis & call mvn clean & cd .. +cd sa-token-demo-alone-redis-cluster & call mvn clean & cd .. +cd sa-token-demo-case & call mvn clean & cd .. cd sa-token-demo-dubbo-consumer & call mvn clean & cd .. cd sa-token-demo-dubbo-provider & call mvn clean & cd .. cd sa-token-demo-grpc & call mvn clean & cd .. @@ -16,15 +18,19 @@ cd sa-token-demo-quick-login & call mvn clean & cd .. cd sa-token-demo-solon & call mvn clean & cd .. cd sa-token-demo-case & call mvn clean & cd .. cd sa-token-demo-springboot & call mvn clean & cd .. +cd sa-token-demo-springboot3-redis & call mvn clean & cd .. cd sa-token-demo-springboot-redis & call mvn clean & cd .. +cd sa-token-demo-springboot-redisson & call mvn clean & cd .. cd sa-token-demo-test & call mvn clean & cd .. cd sa-token-demo-sso1-client & call mvn clean & cd .. cd sa-token-demo-sso2-client & call mvn clean & cd .. cd sa-token-demo-sso3-client & call mvn clean & cd .. cd sa-token-demo-sso3-client-nosdk & call mvn clean & cd .. cd sa-token-demo-sso-server & call mvn clean & cd .. +cd sa-token-demo-sso-server-solon & call mvn clean & cd .. cd sa-token-demo-thymeleaf & call mvn clean & cd .. cd sa-token-demo-webflux & call mvn clean & cd .. +cd sa-token-demo-webflux-springboot3 & call mvn clean & cd .. cd sa-token-demo-websocket & call mvn clean & cd .. cd sa-token-demo-websocket-spring & call mvn clean & cd .. diff --git a/pom.xml b/pom.xml index 6a608381f..f4954cd6c 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ - 1.33.0 + 1.34.0 1.8 utf-8 utf-8 @@ -95,14 +95,31 @@ org.apache.maven.plugins maven-compiler-plugin - 3.2 + 3.10.1 1.8 1.8 UTF-8 - + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + + attach-javadocs + + jar + + + -Xdoclint:none + + + + + org.codehaus.mojo diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java index 1f8599c96..0635105cc 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java @@ -17,7 +17,7 @@ public interface SaSignTemplate { /** - * 将所有参数连接成一个字符串(不排序),形如:b=2&a=1&c=3 + * 将所有参数连接成一个字符串(不排序),形如:b=28a=18c=3 * @param paramsMap 参数列表 * @return 拼接出的参数字符串 */ @@ -42,7 +42,7 @@ public default String joinParams(Map paramsMap) { } /** - * 将所有参数按照字典顺序连接成一个字符串,形如:a=1&b=2&c=3 + * 将所有参数按照字典顺序连接成一个字符串,形如:a=18b=28c=3 * @param paramsMap 参数列表 * @return 拼接出的参数字符串 */ @@ -109,7 +109,7 @@ public default Map addSignParams(Map paramsMap, /** * 给 paramsMap 追加 timestamp、nonce、sign 三个参数,并转换为参数字符串,形如: - * data=xxx&nonce=xxx×tamp=xxx&sign=xxx + * data=xxx8nonce=xxx8timestamp=xxx8sign=xxx * @param paramsMap 参数列表 * @param key 秘钥 * @return 加工后的参数列表 转化为的参数字符串 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java index 95fe51aa7..1a12acbb6 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java @@ -127,6 +127,7 @@ public default void deleteToken(String service, String token) { /** * 获取映射关系的持久化key + * @param service 服务标识 * @param token token值 * @return key */ diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java index 4da4dde0e..17b141c17 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java @@ -15,7 +15,7 @@ private SaTokenConsts() { /** * Sa-Token 当前版本号 */ - public static final String VERSION_NO = "v1.33.0"; + public static final String VERSION_NO = "v1.34.0"; /** * Sa-Token 开源地址 Gitee diff --git a/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml b/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml index c98339968..9cbf8e009 100644 --- a/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml +++ b/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 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 3d28d1bbb..d0ff82705 100644 --- a/sa-token-demo/sa-token-demo-alone-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-alone-redis/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-case/pom.xml b/sa-token-demo/sa-token-demo-case/pom.xml index 87b0c193e..4761b7537 100644 --- a/sa-token-demo/sa-token-demo-case/pom.xml +++ b/sa-token-demo/sa-token-demo-case/pom.xml @@ -17,7 +17,7 @@ - 1.33.0 + 1.34.0 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 4c7cad6fc..4b7f2a84a 100644 --- a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.33.0 + 1.34.0 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 23acfb596..8db1bc6d4 100644 --- a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-grpc/pom.xml b/sa-token-demo/sa-token-demo-grpc/pom.xml index 7e14f0c3d..54def1849 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.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml index 2c4ce042f..8f184e813 100644 --- a/sa-token-demo/sa-token-demo-jwt/pom.xml +++ b/sa-token-demo/sa-token-demo-jwt/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-oauth2-client/pom.xml b/sa-token-demo/sa-token-demo-oauth2-client/pom.xml index 98437ef37..b054c662c 100644 --- a/sa-token-demo/sa-token-demo-oauth2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-oauth2-client/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.33.0 + 1.34.0 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 e8b3f20d6..720686b95 100644 --- a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml +++ b/sa-token-demo/sa-token-demo-oauth2-server/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.33.0 + 1.34.0 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 1c6d9b137..581b4541b 100644 --- a/sa-token-demo/sa-token-demo-quick-login/pom.xml +++ b/sa-token-demo/sa-token-demo-quick-login/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml index 508d085f4..5bb3b8162 100644 --- a/sa-token-demo/sa-token-demo-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-solon/pom.xml @@ -9,7 +9,7 @@ - 1.33.0 + 1.34.0 1.10.13 UTF-8 UTF-8 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 f21e64530..5a8f0284b 100644 --- a/sa-token-demo/sa-token-demo-springboot-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot-redis/pom.xml @@ -17,7 +17,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml b/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml index b41acbdcd..f5aa6c6f8 100644 --- a/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml @@ -17,7 +17,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml index d4646392f..207370adc 100644 --- a/sa-token-demo/sa-token-demo-springboot/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot/pom.xml @@ -17,7 +17,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml b/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml index 111171704..852d73935 100644 --- a/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-server-solon/pom.xml index bf8703715..0c7c41d7b 100644 --- a/sa-token-demo/sa-token-demo-sso-server-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-server-solon/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 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 75c553479..befbc2ceb 100644 --- a/sa-token-demo/sa-token-demo-sso-server/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-server/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 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 51df0c9b1..644f2c0f2 100644 --- a/sa-token-demo/sa-token-demo-sso1-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso1-client/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 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 9e74388c7..62d2582cd 100644 --- a/sa-token-demo/sa-token-demo-sso2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso2-client/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 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 ccad44045..e6784142b 100644 --- a/sa-token-demo/sa-token-demo-sso3-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso3-client/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-test/pom.xml b/sa-token-demo/sa-token-demo-test/pom.xml index 41ae25d0d..18fffb8d7 100644 --- a/sa-token-demo/sa-token-demo-test/pom.xml +++ b/sa-token-demo/sa-token-demo-test/pom.xml @@ -17,7 +17,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml index 32743ba83..f0c188225 100644 --- a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml +++ b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml b/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml index 8278a15cb..30f134dfe 100644 --- a/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml +++ b/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml index ca81cd358..f102a4432 100644 --- a/sa-token-demo/sa-token-demo-webflux/pom.xml +++ b/sa-token-demo/sa-token-demo-webflux/pom.xml @@ -16,7 +16,7 @@ - 1.33.0 + 1.34.0 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 5688bba12..4f4b52724 100644 --- a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml +++ b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml @@ -17,7 +17,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-demo/sa-token-demo-websocket/pom.xml b/sa-token-demo/sa-token-demo-websocket/pom.xml index 420952213..68f6d8e13 100644 --- a/sa-token-demo/sa-token-demo-websocket/pom.xml +++ b/sa-token-demo/sa-token-demo-websocket/pom.xml @@ -17,7 +17,7 @@ - 1.33.0 + 1.34.0 diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index 72a52509c..0039ebf5d 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -12,7 +12,7 @@ Sa-Token Dependencies - 1.33.0 + 1.34.0 2.5.14 @@ -397,7 +397,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.2 + 3.10.1 1.8 1.8 diff --git a/sa-token-doc/README.md b/sa-token-doc/README.md index aa435466f..0263fa217 100644 --- a/sa-token-doc/README.md +++ b/sa-token-doc/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.33.0

+

Sa-Token v1.34.0

一个轻量级 Java 权限认证框架,让鉴权变得简单、优雅!

diff --git a/sa-token-doc/doc.html b/sa-token-doc/doc.html index cef3a17c4..2d3241480 100644 --- a/sa-token-doc/doc.html +++ b/sa-token-doc/doc.html @@ -18,7 +18,7 @@

Sa-Token

- v1.33.0 + v1.34.0
@@ -28,6 +28,7 @@

Sa-Token