From 05b227e332a9116a6b0a1168396514d61b7db552 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sat, 22 Oct 2022 10:48:23 +0800
Subject: [PATCH] =?UTF-8?q?v.1.31.2.temp=20=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 +-
 .../com/pj/cases/use/SaSessionController.java |  1 +
 .../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 +-
 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/new-version.md             | 21 ++++++++++++++++++-
 sa-token-plugin/pom.xml                       |  2 +-
 26 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index d8b1fd50..b33f3de9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 	
 	<!-- 一些属性 -->
 	<properties>
-		<revision>1.31.1.temp</revision>
+		<revision>1.31.2.temp</revision>
         <jdk.version>1.8</jdk.version>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
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 59af034c..c90f77f1 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.1.temp";
+	public static final String VERSION_NO = "v1.31.2.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 7f2a6067..03b6299c 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 25e66d42..40b7680e 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</sa-token.version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/SaSessionController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/SaSessionController.java
index 579a4467..ea85b84e 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/SaSessionController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/SaSessionController.java
@@ -25,6 +25,7 @@ public class SaSessionController {
 
 	/*
 	 * 前提：首先调用登录接口进行登录，代码在 com.pj.cases.use.LoginAuthController 中有详细解释，此处不再赘述 
+	 * 		---- http://localhost:8081/acc/doLogin?name=zhang&pwd=123456
 	 */
 	
 	// 简单存取值   ---- http://localhost:8081/session/getValue
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 50cd6ad8..ec0e7bbe 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 @@
 	<properties> 
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 91f59c8e..e917fede 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 @@
 	<properties> 
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index c14c9ef8..009a8d39 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 @@
         <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.31.1.temp</sa-token.version>
+        <sa-token.version>1.31.2.temp</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
index ce2cf50e..acbf1d01 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 9af87eb2..5eaf0020 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 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<!-- 定义 Sa-Token 版本号 -->
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 86244fc9..74f72d5c 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 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<!-- 定义 Sa-Token 版本号 -->
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 6c7fd685..f5f09d52 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index ebd39d18..81b5dafd 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</sa-token.version>
 	</properties>
 
 	<dependencies>
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 b066e57d..79b7509c 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 2dd3f1ea..78c76ea4 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 1c5d2c21..1594b768 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index c98dd7bd..4f3b544e 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index b98d79c2..814ff540 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 31224e47..a355d892 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 1dbc211a..dd5d1021 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 7b756a07..064078d4 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 3f1414b4..04e3e42a 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 2be2ce3c..8fda6ff3 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</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
index 8386c87c..abed4442 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 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.31.1.temp</sa-token.version>
+		<sa-token.version>1.31.2.temp</sa-token.version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-doc/start/new-version.md b/sa-token-doc/start/new-version.md
index 477e5649..7f610f24 100644
--- a/sa-token-doc/start/new-version.md
+++ b/sa-token-doc/start/new-version.md
@@ -22,7 +22,7 @@ Maven依赖一直无法加载成功？[参考解决方案](https://sa-token.cc/d
 
 ### 最新版本
 
-v1.31.1.temp 过渡版本，仅做学习测试，不推荐上生产：
+**2022-10-19：v1.31.1.temp 过渡版本，仅做学习测试，不推荐上生产：**
 ``` xml
 <!-- Sa-Token 权限认证 -->
 <dependency>
@@ -43,6 +43,25 @@ v1.31.1.temp 过渡版本，仅做学习测试，不推荐上生产：
 - 新增：新增 `sa-token-dao-redis-fastjson2` 插件。
 
 
+**2022-10-22：v1.31.2.temp 过渡版本，仅做学习测试，不推荐上生产：**
+``` xml
+<!-- Sa-Token 权限认证 -->
+<dependency>
+    <groupId>cn.dev33</groupId>
+    <artifactId>sa-token-spring-boot-starter</artifactId>
+    <version>1.31.2.temp</version>
+</dependency>
+```
+
+更新日志：
+- 文档：新增多账号体系混合鉴权代码示例。
+- 文档：文档增加 Gradle 依赖方式和 properties 风格配置。
+- 修复：修复 `sa-token-quick-login` 插件指定拦截排除路由不生效的问题。
+- 修复：修复 `sa-token-alone-redis` + `sa-token-dao-redis-fastson` 时 Redis 无法分离的问题。
+- 新增：新增全局配置 `is-write-header`，控制登录后是否将 Token 写入响应头。
+- 优化：优化版本号定义，父 pom.xml 统一定义依赖版本号，并升级部分依赖。
+
+
 
 
 
diff --git a/sa-token-plugin/pom.xml b/sa-token-plugin/pom.xml
index 72d6e107..4ab2d496 100644
--- a/sa-token-plugin/pom.xml
+++ b/sa-token-plugin/pom.xml
@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
-			<version>2.5.12</version>
+			<version>${springboot.version}</version>
 			<optional>true</optional>
 		</dependency>
 	</dependencies>