From 77ad2cf535287bc908268b9536278b804b305329 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 19 Oct 2022 08:41:49 +0800
Subject: [PATCH] =?UTF-8?q?v1.31.1.temp=20=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mvn clean.bat | 2 +
pom.xml | 2 +-
.../cn/dev33/satoken/util/SaTokenConsts.java | 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/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 +-
.../main/java/com/pj/test/TestController.java | 1 -
sa-token-demo/sa-token-demo-thymeleaf/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-doc/start/download.md | 4 ++
sa-token-doc/start/example.md | 1 +
sa-token-doc/start/new-version.md | 37 ++++++++++++++++++-
28 files changed, 66 insertions(+), 25 deletions(-)
diff --git a/mvn clean.bat b/mvn clean.bat
index f0c060e0..5646ce05 100644
--- a/mvn clean.bat
+++ b/mvn clean.bat
@@ -14,8 +14,10 @@ cd sa-token-demo-oauth2-client & call mvn clean & cd ..
cd sa-token-demo-oauth2-server & call mvn clean & cd ..
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-springboot-redis & 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 ..
diff --git a/pom.xml b/pom.xml
index 8d685a71..9b034eda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
- 1.31.0
+ 1.31.1.temp
1.8
utf-8
utf-8
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 f52b9ad4..ad45165d 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.31.0";
+ public static final String VERSION_NO = "v1.31.1.temp";
/**
* Sa-Token 开源地址 Gitee
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 9fbf24b6..4770482a 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.31.0
+ 1.31.1.temp
diff --git a/sa-token-demo/sa-token-demo-case/pom.xml b/sa-token-demo/sa-token-demo-case/pom.xml
index 49f89376..ed81e8c5 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.31.0
+ 1.31.1.temp
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 bc043000..1d4c4656 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.0
+ 1.31.1.temp
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 473ace45..c58b1117 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.0
+ 1.31.1.temp
diff --git a/sa-token-demo/sa-token-demo-grpc/pom.xml b/sa-token-demo/sa-token-demo-grpc/pom.xml
index ccad1242..bf69b928 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.0
+ 1.31.1.temp
diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml
index 98f5e2a3..dac7baec 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.31.0
+ 1.31.1.temp
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 1aa7ffea..6aa42c0b 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.31.0
+ 1.31.1.temp
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 d48e5b82..0acb237b 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.31.0
+ 1.31.1.temp
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 4302e031..2d1a05ac 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.31.0
+ 1.31.1.temp
diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml
index 37a41133..970ddb34 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.31.0
+ 1.31.1.temp
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 187e5c09..2fefd3c9 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.31.0
+ 1.31.1.temp
diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml
index 8fe23972..f52afcb2 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.31.0
+ 1.31.1.temp
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 25dbb860..ce7fd481 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.31.0
+ 1.31.1.temp
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 052101f2..3d02ec19 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.31.0
+ 1.31.1.temp
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 fb30c6e0..2c0ec337 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.31.0
+ 1.31.1.temp
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 0bc72d8d..dabc819d 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.31.0
+ 1.31.1.temp
diff --git a/sa-token-demo/sa-token-demo-test/pom.xml b/sa-token-demo/sa-token-demo-test/pom.xml
index 1545123c..d8db946a 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.31.0
+ 1.31.1.temp
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index dc480dfe..d6772e98 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -22,7 +22,6 @@ public class TestController {
StpUtil.login(id);
return SaResult.ok("登录成功");
}
-
// 测试 浏览器访问: http://localhost:8081/test/test
@RequestMapping("test")
diff --git a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml
index 7c9ab1da..e11b5134 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.31.0
+ 1.31.1.temp
diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml
index c1221171..784bb3e0 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.31.0
+ 1.31.1.temp
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 599c7a66..e9f4a5e4 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.31.0
+ 1.31.1.temp
diff --git a/sa-token-demo/sa-token-demo-websocket/pom.xml b/sa-token-demo/sa-token-demo-websocket/pom.xml
index e06f9dbc..f64edcf6 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.31.0
+ 1.31.1.temp
diff --git a/sa-token-doc/start/download.md b/sa-token-doc/start/download.md
index 9e795566..d0f96b20 100644
--- a/sa-token-doc/start/download.md
+++ b/sa-token-doc/start/download.md
@@ -149,6 +149,10 @@ implementation 'cn.dev33:sa-token-core:${sa.top.version}'
注:JDK版本:`v1.8+`,SpringBoot:`建议2.0以上`
+## 测试版
+更多内测版本了解:[new-version.md](https://gitee.com/dromara/sa-token/blob/dev/sa-token-doc/start/new-version.md)
+
+
## jar包下载
[点击下载:sa-token-1.6.0.jar](https://oss.dev33.cn/sa-token/sa-token-1.6.0.jar)
diff --git a/sa-token-doc/start/example.md b/sa-token-doc/start/example.md
index dae903fc..f2435d37 100644
--- a/sa-token-doc/start/example.md
+++ b/sa-token-doc/start/example.md
@@ -21,6 +21,7 @@
${sa.top.version}
```
+更多内测版本了解:[new-version.md](https://gitee.com/dromara/sa-token/blob/dev/sa-token-doc/start/new-version.md)
### 3、设置配置文件
diff --git a/sa-token-doc/start/new-version.md b/sa-token-doc/start/new-version.md
index 217dac58..7ca8aa59 100644
--- a/sa-token-doc/start/new-version.md
+++ b/sa-token-doc/start/new-version.md
@@ -4,7 +4,9 @@
---
-正式版最新版本:
+### 正式版本
+v1.31.0 正式版,可上生产:
+
``` xml
@@ -14,4 +16,37 @@
```
+---
+
+### 最新版本
+
+v1.31.1.temp 临时版本,仅做学习测试,不推荐上生产:
+``` xml
+
+
+ cn.dev33
+ sa-token-spring-boot-starter
+ 1.31.1.temp
+
+```
+
+更新日志:
+- 文档:[自定义 SaTokenContext 指南] 章节新增对三种模型的解释。
+- 文档:基础章节新增练习测试。
+- 文档:部分章节新增代码示例。
+- 文档:增加全局调色功能。
+- 升级:`SaFoxUtil.getValueByType()` 新增对 char 类型的转换。
+- 修复:修复 sa-token-dao-redis-fastjson 插件多余序列化 `timeout` 字段的问题。
+- 修复:修复 sa-token-dao-redis-fastjson 插件 `session.getModel` 无法反序列化实体类的问题。
+- 新增:新增 `sa-token-dao-redis-fastjson2` 插件。
+
+
+
+
+
+
+
+
+
+