From 1e874264818b37dabbf1ebe6f45090baa192080b Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 11 Jan 2023 14:35:04 +0800
Subject: [PATCH] =?UTF-8?q?v1.34.0=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
mvn clean.bat | 6 +++++
pom.xml | 23 ++++++++++++++++---
.../cn/dev33/satoken/sign/SaSignTemplate.java | 6 ++---
.../dev33/satoken/temp/SaTempInterface.java | 1 +
.../cn/dev33/satoken/util/SaTokenConsts.java | 2 +-
.../sa-token-demo-alone-redis-cluster/pom.xml | 2 +-
.../sa-token-demo-alone-redis/pom.xml | 2 +-
sa-token-demo/sa-token-demo-case/pom.xml | 2 +-
.../sa-token-demo-dubbo-consumer/pom.xml | 2 +-
.../sa-token-demo-dubbo-provider/pom.xml | 2 +-
sa-token-demo/sa-token-demo-grpc/pom.xml | 2 +-
sa-token-demo/sa-token-demo-jwt/pom.xml | 2 +-
.../sa-token-demo-oauth2-client/pom.xml | 2 +-
.../sa-token-demo-oauth2-server/pom.xml | 2 +-
.../sa-token-demo-quick-login/pom.xml | 2 +-
sa-token-demo/sa-token-demo-solon/pom.xml | 2 +-
.../sa-token-demo-springboot-redis/pom.xml | 2 +-
.../sa-token-demo-springboot-redisson/pom.xml | 2 +-
.../sa-token-demo-springboot/pom.xml | 2 +-
.../sa-token-demo-springboot3-redis/pom.xml | 2 +-
.../sa-token-demo-sso-server-solon/pom.xml | 2 +-
.../sa-token-demo-sso-server/pom.xml | 2 +-
.../sa-token-demo-sso1-client/pom.xml | 2 +-
.../sa-token-demo-sso2-client/pom.xml | 2 +-
.../sa-token-demo-sso3-client/pom.xml | 2 +-
sa-token-demo/sa-token-demo-test/pom.xml | 2 +-
sa-token-demo/sa-token-demo-thymeleaf/pom.xml | 2 +-
.../sa-token-demo-webflux-springboot3/pom.xml | 2 +-
sa-token-demo/sa-token-demo-webflux/pom.xml | 2 +-
.../sa-token-demo-websocket-spring/pom.xml | 2 +-
sa-token-demo/sa-token-demo-websocket/pom.xml | 2 +-
sa-token-dependencies/pom.xml | 4 ++--
sa-token-doc/README.md | 2 +-
sa-token-doc/doc.html | 5 ++--
sa-token-doc/index.html | 23 ++++++++++++++++++-
sa-token-doc/more/sa-token-donate.md | 11 ++++++++-
sa-token-doc/more/update-log.md | 2 +-
sa-token-doc/start/new-version.md | 4 ++--
sa-token-plugin/sa-token-context-grpc/pom.xml | 11 +++++----
40 files changed, 105 insertions(+), 49 deletions(-)
diff --git a/README.md b/README.md
index 7b5311c4..e85ba80b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-Sa-Token v1.33.0
+Sa-Token v1.34.0
一个轻量级 Java 权限认证框架,让鉴权变得简单、优雅!
diff --git a/mvn clean.bat b/mvn clean.bat
index 5646ce05..c15f651f 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 6a608381..f4954cd6 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 1f8599c9..0635105c 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 @@ import cn.dev33.satoken.util.SaFoxUtil;
public interface SaSignTemplate {
/**
- * 将所有参数连接成一个字符串(不排序),形如:b=2&a=1&c=3
+ * 将所有参数连接成一个字符串(不排序),形如:b=28a=18c=3
* @param paramsMap 参数列表
* @return 拼接出的参数字符串
*/
@@ -42,7 +42,7 @@ public interface SaSignTemplate {
}
/**
- * 将所有参数按照字典顺序连接成一个字符串,形如:a=1&b=2&c=3
+ * 将所有参数按照字典顺序连接成一个字符串,形如:a=18b=28c=3
* @param paramsMap 参数列表
* @return 拼接出的参数字符串
*/
@@ -109,7 +109,7 @@ public interface SaSignTemplate {
/**
* 给 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 95fe51aa..1a12acbb 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 interface SaTempInterface {
/**
* 获取映射关系的持久化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 4da4dde0..17b141c1 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 @@ public class 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 c9833996..9cbf8e00 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 3d28d1bb..d0ff8270 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 87b0c193..4761b753 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 4c7cad6f..4b7f2a84 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 23acfb59..8db1bc6d 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 7e14f0c3..54def184 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 2c4ce042..8f184e81 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 98437ef3..b054c662 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 e8b3f20d..720686b9 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 1c6d9b13..581b4541 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 508d085f..5bb3b816 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 f21e6453..5a8f0284 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 b41acbdc..f5aa6c6f 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 d4646392..207370ad 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 11117170..852d7393 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 bf870371..0c7c41d7 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 75c55347..befbc2ce 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 51df0c9b..644f2c0f 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 9e74388c..62d2582c 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 ccad4404..e6784142 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 41ae25d0..18fffb8d 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 32743ba8..f0c18822 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 8278a15c..30f134df 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 ca81cd35..f102a443 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 5688bba1..4f4b5272 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 42095221..68f6d8e1 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 72a52509..0039ebf5 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 aa435466..0263fa21 100644
--- a/sa-token-doc/README.md
+++ b/sa-token-doc/README.md
@@ -1,7 +1,7 @@
-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 cef3a17c..2d324148 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 @@