Merge branch 'dev' of https://github.com/dromara/Sa-Token into dev

2024-11-30 02:48:10 +08:00 · 2023-09-22 03:51:21 +08:00 · 2023-09-22 03:51:21 +08:00 · c0587d5e92
commit c0587d5e92
parent 33ece1a2b0 1fcda76ce4
48 changed files with 88 additions and 62 deletions
--- 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.35.0.RC</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.36.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>
--- a/pom.xml
+++ b/pom.xml
@ -37,7 +37,7 @@
 	
 	<!-- 一些属性 -->
 	<properties>
-        <revision>1.35.0.RC</revision>
+        <revision>1.36.0</revision>
        <jdk.version>1.8</jdk.version>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
--- a/sa-token-bom/pom.xml
+++ b/sa-token-bom/pom.xml
@ -13,7 +13,7 @@
    <url>https://github.com/dromara/sa-token</url>

    <properties>
-        <revision>1.35.0.RC</revision>
+        <revision>1.36.0</revision>
    </properties>

    <dependencyManagement>
--- 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
@ -36,7 +36,7 @@ public class SaTokenConsts {
 	/**
 	 * Sa-Token 当前版本号 
 	 */
-	public static final String VERSION_NO = "v1.35.0.RC";
+	public static final String VERSION_NO = "v1.36.0";

 	/**
 	 * Sa-Token 开源地址 Gitee 
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-alone-redis/pom.xml
+++ b/sa-token-demo/sa-token-demo-alone-redis/pom.xml
@ -17,7 +17,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-bom-import/pom.xml
+++ b/sa-token-demo/sa-token-demo-bom-import/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
@ -73,7 +73,7 @@
 			<dependency>
 				<groupId>cn.dev33</groupId>
 				<artifactId>sa-token-bom</artifactId>
-				<version>1.35.0</version>
+				<version>1.36.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-cookie-server/pom.xml
+++ b/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-cookie-server/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 		<java.run.main.class>com.pj.SaTokenCrossCookieApplication</java.run.main.class>
 	</properties>

--- a/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-header-server/pom.xml
+++ b/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-header-server/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 		<java.run.main.class>com.pj.SaTokenCrossHeaderApplication</java.run.main.class>
 	</properties>

--- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo/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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 		<dubbo.version>2.7.21</dubbo.version>
 		<nacos.version>1.4.2</nacos.version>
 	</properties>
--- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo/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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 		<dubbo.version>2.7.21</dubbo.version>
 		<nacos.version>1.4.2</nacos.version>
 	</properties>
--- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 		<dubbo.version>3.2.2</dubbo.version>
 		<nacos.version>2.2.2</nacos.version>
 	</properties>
--- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 		<dubbo.version>3.2.2</dubbo.version>
 		<nacos.version>2.2.2</nacos.version>
 	</properties>
--- 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.35.0.RC</sa-token.version>
+        <sa-token.version>1.36.0</sa-token.version>
    </properties>

    <dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-oauth2/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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>
 	
 	<dependencies>
--- a/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/pom.xml
+++ b/sa-token-demo/sa-token-demo-oauth2/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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>
 	
 	<dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/pom.xml
+++ b/sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/pom.xml
@ -17,7 +17,7 @@
    </parent>

    <properties>
-        <sa-token.version>1.35.0.RC</sa-token.version>
+        <sa-token.version>1.36.0</sa-token.version>
    </properties>

    <dependencies>
--- a/sa-token-demo/sa-token-demo-solon-redisson/pom.xml
+++ b/sa-token-demo/sa-token-demo-solon-redisson/pom.xml
@ -16,7 +16,7 @@

 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
--- a/sa-token-demo/sa-token-demo-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-solon/pom.xml
@ -16,7 +16,7 @@

 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 		<solon.version>2.2.3</solon.version>
 	</properties>

--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml
@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 		<java.run.main.class>com.pj.SaTokenApplication</java.run.main.class>
 	</properties>

--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- 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.35.0.RC</sa-token.version>
+		<sa-token.version>1.36.0</sa-token.version>
 	</properties>

 	<dependencies>
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@ -12,7 +12,7 @@
    <description>Sa-Token Dependencies</description>

    <properties>
-        <revision>1.35.0.RC</revision>
+        <revision>1.36.0</revision>
 		
 		<!-- 统一定义依赖版本号 -->
 		<springboot.version>2.5.15</springboot.version>
--- 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.35.0.RC</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.36.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>
--- a/sa-token-doc/doc.html
+++ b/sa-token-doc/doc.html
@ -18,7 +18,7 @@
 					<div class="logo-box">
 						<img src="logo.png" title="logo" />
 						<h1 class="logo-text">Sa-Token</h1>
-						<sub>v1.35.0.RC</sub>
+						<sub>v1.36.0</sub>
 					</div>
 				</a>
 			</div>
@ -103,7 +103,7 @@
 				<!-- <a class="p-none wzi" href="#/more/blog">博客</a> -->
 				<a class="p-none wzi" href="#/more/join-group">加入讨论群</a>
 				<a class="p-none wzi" href="#/more/sa-token-donate">赞助</a>
-				<a class="p-none wzi" href="#/sso/sso-pro">🔥 SSO商业版</a>
+				<a class="p-none wzi" href="#/sso/sso-pro">?? SSO商业版</a>
 				<div class="zk-box">
 					<a class="wzi" href="javascript:;">
 						<span>相关资源 </span>
@ -166,7 +166,7 @@
 		<script src="./static/docsify-plugin.js?v=6"></script>
 		<script src="./static/is-star-plugin.js?v=6"></script>
 		<script>
-			var saTokenTopVersion = '1.35.0.RC';	// Sa-Token最新版本 
+			var saTokenTopVersion = '1.36.0';	// Sa-Token最新版本 
 			var name = '<img style="width: 60px; height: 60px; vertical-align: middle;" src="logo.png" alt="logo" /> ';
 			name += '<b style="font-size: 28px; vertical-align: middle;">Sa-Token</b> <sub>v' + saTokenTopVersion + '</sub>';
 			window.$docsify = {
--- a/sa-token-doc/index.html
+++ b/sa-token-doc/index.html
@ -67,7 +67,7 @@
 					<!-- <a class="p-none wzi" href="doc.html#/more/blog">博客</a> -->
 					<a class="p-none wzi" href="doc.html#/more/join-group">加入讨论群</a>
 					<a class="p-none wzi" href="doc.html#/more/sa-token-donate">赞助</a>
-					<a class="p-none wzi" href="doc.html#/sso/sso-pro">🔥 SSO商业版</a>
+					<a class="p-none wzi" href="doc.html#/sso/sso-pro">?? SSO商业版</a>
 					<div class="zk-box">
 						<a class="wzi" href="javascript:;">
 							<span>相关资源 </span>
@ -109,7 +109,7 @@
 			<div class="main-box">
 				<div class="content-box">
 					<!-- <div class="fenge"></div> -->
-					<h1>Sa-Token<small>v1.35.0.RC</small></h1>
+					<h1>Sa-Token<small>v1.36.0</small></h1>
 					<div class="sub-title">一个轻量级 java 权限认证框架，让鉴权变得简单、优雅！</div>
 					<div class="btn-box">
 						<a class="abtn" href="https://github.com/dromara/sa-token" target="_blank">GitHub</a>
@ -147,7 +147,7 @@
 							<p>多端登录、单端登录、同端互斥登录、七天免登录…… 多种登录策略只需改个配置即可完成</p>
 						</div>
 						<div class="feature">
-							<h2>🔑️ 权限认证</h2>
+							<h2>??️ 权限认证</h2>
 							<p>权限认证、角色认证、会话二级认证、注解鉴权、路由鉴权……多种姿势灵活鉴权</p>
 						</div>
 						<div class="feature">
@ -155,27 +155,27 @@
 							<p>强制注销、踢人下线、账号封禁、身份切换、自动续签 …… 提供完善的会话管理方案</p>
 						</div>
 						<div class="feature">
-							<h2>🔎️ Redis集成</h2>
+							<h2>??️ Redis集成</h2>
 							<p>提供 Redis 集成方案、项目重启数据不丢失、多系统数据互通，可自定义数据持久化策略</p>
 						</div>
 						<div class="feature">
-							<h2>🚀️ 前后端分离</h2>
+							<h2>??️ 前后端分离</h2>
 							<p>内置多种 Token 读取策略，适配APP、小程序、SPA单页应用等前后端分离场景</p>
 						</div>
 						<div class="feature">
-							<h2>️🍃 单点登录</h2>
+							<h2>️?? 单点登录</h2>
 							<p>同域、跨域、共享Redis、跨Redis、前后端一体、前后端分离……提供各种架构下的SSO接入方案</p>
 						</div>
 						<div class="feature">
-							<h2>🍂 OAuth2.0</h2>
+							<h2>?? OAuth2.0</h2>
 							<p>轻松搭建 OAuth2.0 认证中心，支持四种授权模式，支持 openid 授权机制，支持二次扩展开发</p>
 						</div>
 						<div class="feature">
-							<h2>💦️ 微服务支持</h2>
+							<h2>??️ 微服务支持</h2>
 							<p>分布式 Session 会话、网关统一鉴权、RPC调用鉴权……提供开箱即用的微服务认证方案</p>
 						</div>
 						<div class="feature">
-							<h2>🗳️ 开箱即用</h2>
+							<h2>??️ 开箱即用</h2>
 							<p>提供SpringMVC、WebFlux、Solon、jwt 等常见框架集成包，真正的开箱即用……</p>
 						</div>
 					</div>
@ -460,7 +460,7 @@
 						</a>
 						<a href="https://hutool.cn/" target="_blank">
 							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/hutool.jpg"
-								msg="🍬小而全的Java工具类库，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。">
+								msg="??小而全的Java工具类库，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。">
 						</a>
 						<a href="https://sa-token.cc/" target="_blank">
 							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/sa-token.png"
@ -500,7 +500,7 @@
 						</a>
 						<a href="https://easy-es.cn/" target="_blank">
 							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/easy-es2.png"
-								msg="🚀傻瓜级ElasticSearch搜索引擎ORM框架">
+								msg="??傻瓜级ElasticSearch搜索引擎ORM框架">
 						</a>
 						<a href="https://gitee.com/dromara/northstar" target="_blank">
 							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/northstar_logo.png"
@ -524,11 +524,11 @@
 						</a>
 						<a href="https://async.sizegang.cn/" target="_blank">
 							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/gobrs-async.png"
-								msg="🔥 配置极简功能强大的异步任务动态编排框架">
+								msg="?? 配置极简功能强大的异步任务动态编排框架">
 						</a>
 						<a href="https://dynamictp.cn/" target="_blank">
 							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/dynamic-tp.png"
-								msg="🔥🔥🔥 基于配置中心的轻量级动态可监控线程池">
+								msg="?????? 基于配置中心的轻量级动态可监控线程池">
 						</a>
 						<a href="https://www.x-easypdf.cn" target="_blank">
 							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/x-easypdf.png"
--- a/sa-token-doc/more/update-log.md
+++ b/sa-token-doc/more/update-log.md
@ -1,5 +1,25 @@
 # 更新日志 

+### v1.36.0 @2023-9-22
+- sa-token-core：
+	- 修复：API接口签名校验参数接口NPE问题，增加必须参数的非空校验处理。
+	- 新增：加密工具类新增 sha384、sha512 实现。 感谢 `@若初995` 提交的pr。   **[重要]**
+	- 修复：`SaFoxUtil.vagueMatch()` 正则匹配的一些问题。  **[漏洞修复]**
+	- 修复：`SaRouter.match()` 路由匹配的一些问题。  **[漏洞修复]**
+- 其它：
+	- 优化：`sa-token-alone-redis` 去掉不必要的配置项判断。
+	- 新增：`sa-token-solon-plugin` 增加对 solon 网关的支持。
+	- 新增：新增第三方插件专用仓库：`sa-token-three-plugin` 。
+	- 升级：`sa-token-solon-plugin` 增加对 solon 网关的支持。
+- 文档：
+	- 新增：新增开启全局懒加载时不能注入上下文处理器的处理方案 。
+	- 新增：新增 RefreshToken 示例。 **[重要]**
+	- 新增：文档新增 sa-token 小助手，可在线实时技术提问。 **[重要]**
+	- 优化：其它一些优化。
+- 新增插件：
+	- `sa-token-redisson-jackson2`：通用 redisson 集成方案 （spring, solon, jfinal 等都可用）
+
+

 ### v1.35.0 @2023-6-23
 - sa-token-core：
--- a/sa-token-doc/plugin/dao-extend.md
+++ b/sa-token-doc/plugin/dao-extend.md
@ -13,6 +13,7 @@
 - sa-token-redis-fastjson：Redis集成包，使用 fastjson 序列化方式。
 - sa-token-redis-fastjson2：Redis集成包，使用 fastjson2 序列化方式。
 - sa-token-redisson-jackson：Redis集成包，Redisson客户端使用，jackson 序列化方式。
+- sa-token-redisson-jackson2：通用 redisson 集成方案 （spring, solon, jfinal 等都可用）。

 有关 Redis 集成，详细参考：[集成Redis](/up/integ-redis)，更多存储方式欢迎提交PR 

--- a/sa-token-doc/start/new-version.md
+++ b/sa-token-doc/start/new-version.md
@ -5,14 +5,14 @@
 --- 

 ### 正式版本 
-v1.35.0.RC 正式版，可上生产：
+v1.36.0 正式版，可上生产：

 ``` xml
 <!-- Sa-Token 权限认证 -->
 <dependency>
    <groupId>cn.dev33</groupId>
    <artifactId>sa-token-spring-boot-starter</artifactId>
-    <version>1.35.0.RC</version>
+    <version>1.36.0</version>
 </dependency>
 ```

--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
@ -23,6 +23,11 @@ import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
 import cn.dev33.satoken.oauth2.logic.SaOAuth2Template;
 import cn.dev33.satoken.oauth2.logic.SaOAuth2Util;

+/*
+	小提示：如果你在 idea 中运行源码时出现异常：java: 程序包cn.dev33.satoken.oauth2不存在。
+			在项目根目录进入 cmd，执行 mvn package 即可解决
+ */
+
 /**
 * 注入 Sa-Token-OAuth2 所需要的组件
 *