v1.34.0 更新

dromara · Jan 11, 2023 · 1e87426 · 1e87426
1 parent 69cecb5
commit 1e87426
Show file tree

Hide file tree

Showing 40 changed files with 105 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
  <img alt="logo" src="https://sa-token.cc/logo.png" width="150" height="150">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.33.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.34.0</h1>
 <h4 align="center">一个轻量级 Java 权限认证框架，让鉴权变得简单、优雅！</h4>
 <p align="center">
  <a href="https://gitee.com/dromara/sa-token/stargazers"><img src="https://gitee.com/dromara/sa-token/badge/star.svg?theme=gvp"></a>

diff --git 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
@@ -39,7 +39,7 @@
 
  <!-- 一些属性 -->
  <properties>
- <revision>1.33.0</revision>
+ <revision>1.34.0</revision>
  <jdk.version>1.8</jdk.version>
  <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
  <project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
@@ -95,14 +95,31 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.10.1</version>
  <configuration>
  <source>1.8</source>
  <target>1.8</target>
  <encoding>UTF-8</encoding>
  </configuration>
  </plugin>
-
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
  <!-- 统一版本号管理 -->
  <plugin>
  <groupId>org.codehaus.mojo</groupId>

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
@@ -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<String, Object> paramsMap) {
  }
 
  /**
- * 将所有参数按照字典顺序连接成一个字符串，形如：a=1&b=2&c=3
+ * 将所有参数按照字典顺序连接成一个字符串，形如：a=18b=28c=3
  * @param paramsMap 参数列表
  * @return 拼接出的参数字符串 
  */
@@ -109,7 +109,7 @@ public default Map<String, Object> addSignParams(Map<String, Object> paramsMap,
 
  /**
  * 给 paramsMap 追加 timestamp、nonce、sign 三个参数，并转换为参数字符串，形如：
- * <code>data=xxx&nonce=xxx&timestamp=xxx&sign=xxx</code>
+ * <code>data=xxx8nonce=xxx8timestamp=xxx8sign=xxx</code>
  * @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
@@ -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
@@ -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
@@ -16,7 +16,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-demo/sa-token-demo-case/pom.xml b/sa-token-demo/sa-token-demo-case/pom.xml
@@ -17,7 +17,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
  <properties> 
  <java.version>1.8</java.version>
  <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
  <properties> 
  <java.version>1.8</java.version>
  <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-demo/sa-token-demo-grpc/pom.xml b/sa-token-demo/sa-token-demo-grpc/pom.xml
@@ -27,7 +27,7 @@
  <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <lombok.version>1.18.10</lombok.version>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml
@@ -16,7 +16,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
  <java.version>1.8</java.version>
  <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
  <!-- 定义 Sa-Token 版本号 -->
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
  <java.version>1.8</java.version>
  <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
  <!-- 定义 Sa-Token 版本号 -->
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml
@@ -9,7 +9,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  <solon.version>1.10.13</solon.version>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml
@@ -17,7 +17,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

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
@@ -16,7 +16,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-demo/sa-token-demo-test/pom.xml b/sa-token-demo/sa-token-demo-test/pom.xml
@@ -17,7 +17,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml
@@ -16,7 +16,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml
@@ -16,7 +16,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git 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 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-demo/sa-token-demo-websocket/pom.xml b/sa-token-demo/sa-token-demo-websocket/pom.xml
@@ -17,7 +17,7 @@
 
  <!-- 定义 Sa-Token 版本号 -->
  <properties>
- <sa-token.version>1.33.0</sa-token.version>
+ <sa-token.version>1.34.0</sa-token.version>
  </properties>
 
  <dependencies>

diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
@@ -12,7 +12,7 @@
  <description>Sa-Token Dependencies</description>
 
  <properties>
- <revision>1.33.0</revision>
+ <revision>1.34.0</revision>
 
  <!-- 统一定义依赖版本号 -->
  <springboot.version>2.5.14</springboot.version>
@@ -397,7 +397,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>3.10.1</version>
  <configuration>
  <source>1.8</source>
  <target>1.8</target>

diff --git a/sa-token-doc/README.md b/sa-token-doc/README.md
@@ -1,7 +1,7 @@
 <p align="center">
  <img alt="logo" src="https://sa-token.cc/logo.png" width="150" height="150">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.33.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.34.0</h1>
 <h5 align="center">一个轻量级 Java 权限认证框架，让鉴权变得简单、优雅！</h5>
 <p align="center" class="badge-box">
  <a href="https://gitee.com/dromara/sa-token/stargazers"><img src="https://gitee.com/dromara/sa-token/badge/star.svg?theme=gvp"></a>