v1.26.0 更新

dromara · Sep 2, 2021 · 84d52f1 · 84d52f1
1 parent 1603872
commit 84d52f1
Show file tree

Hide file tree

Showing 38 changed files with 48 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
 	<img alt="logo" src="https://gitee.com/dromara/sa-token/raw/master/sa-token-doc/doc/logo.png" width="150" height="150">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.25.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.26.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"></a>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cn.dev33</groupId>
     <artifactId>sa-token-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.25.0</version>
+	<version>1.26.0</version>
 
 	<!-- 项目介绍 -->
 	<name>sa-token</name>
@@ -36,7 +36,7 @@
 
 	<!-- 一些属性 -->
 	<properties>
-		<sa-token-version>1.25.0</sa-token-version>
+		<sa-token-version>1.26.0</sa-token-version>
         <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/pom.xml b/sa-token-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-parent</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
@@ -47,7 +47,6 @@ public String getAuthorizationValue() {
 
 	/**
 	 * 对当前会话进行 Basic 校验（使用全局配置的账号密码），校验不通过则抛出异常  
-	 * @param basicAccount 账号（格式为 user:password） 
 	 */
 	public void check() {
 		check(DEFAULT_REALM, SaManager.getConfig().getBasic());
@@ -62,7 +61,7 @@ public void check(String account) {
 	}
 
 	/**
-	 * 对当前会话进行 Basic 校验（手动设置 Realm & 账号密码），校验不通过则抛出异常 
+	 * 对当前会话进行 Basic 校验（手动设置 Realm 和 账号密码），校验不通过则抛出异常 
 	 * @param realm 领域 
 	 * @param account 账号（格式为 user:password）
 	 */

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
@@ -22,7 +22,6 @@ public static String getAuthorizationValue() {
 
 	/**
 	 * 对当前会话进行 Basic 校验（使用全局配置的账号密码），校验不通过则抛出异常  
-	 * @param basicAccount 账号（格式为 user:password） 
 	 */
 	public static void check() {
 		saBasicTemplate.check();
@@ -37,7 +36,7 @@ public static void check(String account) {
 	}
 
 	/**
-	 * 对当前会话进行 Basic 校验（手动设置 Realm & 账号密码），校验不通过则抛出异常 
+	 * 对当前会话进行 Basic 校验（手动设置 Realm 和 账号密码），校验不通过则抛出异常 
 	 * @param realm 领域 
 	 * @param account 账号（格式为 user:password）
 	 */

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
@@ -13,7 +13,7 @@ public class SaTokenConsts {
 	/**
 	 * Sa-Token 当前版本号 
 	 */
-	public static final String VERSION_NO = "v1.25.0";
+	public static final String VERSION_NO = "v1.26.0";
 
 	/**
 	 * Sa-Token 开源地址 

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.25.0</sa-token-version>
+		<sa-token-version>1.26.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.25.0</sa-token-version>
+		<sa-token-version>1.26.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.25.0</sa-token-version>
+		<sa-token-version>1.26.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.25.0</sa-token-version>
+		<sa-token-version>1.26.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
@@ -15,7 +15,7 @@
 
 	<!-- 定义sa-token版本号 -->
 	<properties>
-		<sa-token-version>1.25.0</sa-token-version>
+		<sa-token-version>1.26.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.25.0</sa-token-version>
+		<sa-token-version>1.26.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.25.0</sa-token-version>
+		<sa-token-version>1.26.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.25.0</sa-token-version>
+		<sa-token-version>1.26.0</sa-token-version>
 	</properties>
 
 	<dependencies>

diff --git a/sa-token-demo/sa-token-demo-sso1-server/pom.xml b/sa-token-demo/sa-token-demo-sso1-server/pom.xml
@@ -16,7 +16,7 @@
 
 	<!-- 定义sa-token版本号 -->
 	<properties>
-		<sa-token-version>1.25.0</sa-token-version>
+		<sa-token-version>1.26.0</sa-token-version>
 	</properties>
 
 	<dependencies>

diff --git a/sa-token-demo/sa-token-demo-sso1/pom.xml b/sa-token-demo/sa-token-demo-sso1/pom.xml
@@ -16,7 +16,7 @@
 
 	<!-- 定义sa-token版本号 -->
 	<properties>
-		<sa-token-version>1.25.0</sa-token-version>
+		<sa-token-version>1.26.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.25.0</sa-token-version>
+		<sa-token-version>1.26.0</sa-token-version>
 	</properties>
 
 	<dependencies>

diff --git a/sa-token-demo/sa-token-demo-sso2-server/pom.xml b/sa-token-demo/sa-token-demo-sso2-server/pom.xml
@@ -16,7 +16,7 @@
 
 	<!-- 定义sa-token版本号 -->
 	<properties>
-		<sa-token-version>1.25.0</sa-token-version>
+		<sa-token-version>1.26.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.25.0</sa-token-version>
+		<sa-token-version>1.26.0</sa-token-version>
 	</properties>
 
 	<dependencies>

diff --git a/sa-token-demo/sa-token-demo-sso3-server/pom.xml b/sa-token-demo/sa-token-demo-sso3-server/pom.xml
@@ -16,7 +16,7 @@
 
 	<!-- 定义sa-token版本号 -->
 	<properties>
-		<sa-token-version>1.25.0</sa-token-version>
+		<sa-token-version>1.26.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.25.0</sa-token-version>
+		<sa-token-version>1.26.0</sa-token-version>
 	</properties>
 
 	<dependencies>

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

diff --git a/sa-token-doc/doc/index.html b/sa-token-doc/doc/index.html
@@ -22,6 +22,7 @@ <h1 class="logo-text">Sa-Token</h1>
 		<nav>
 			<select onchange="location.href=this.value">
 				<option value="http://sa-token.dev33.cn/doc/index.html">最新版</option>
+				<option value="http://sa-token.dev33.cn/v/v1.25.0/doc/index.html">v1.25.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.24.0/doc/index.html">v1.24.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.23.0/doc/index.html">v1.23.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.22.0/doc/index.html">v1.22.0</option>
@@ -60,7 +61,7 @@ <h1 class="logo-text">Sa-Token</h1>
 		</div>
 
 		<script>
-			var saTokenTopVersion = '1.25.0';	// Sa-Token最新版本 
+			var saTokenTopVersion = '1.26.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 = {

diff --git a/sa-token-doc/doc/more/update-log.md b/sa-token-doc/doc/more/update-log.md
@@ -1,6 +1,15 @@
 # 更新日志 
 
 
+### 2021-9-2 @v1.26.0
+- 优化：优化单点登录文档 
+- 新增：新增 `Http Basic` 认证 **[重要]** 
+- 新增：文档新增跨域解决方案 
+- 文档：新增 Nginx 转发请求丢失uri的解决方案
+- 文档：新增 SSO 自定义 API 路由示例  **[重要]** 
+- 示例：新增 `SSO-Server` 端前后端分离示例  **[重要]** 
+
+
 ### 2021-8-16 @v1.25.0
 - 新增：`SaRequest`新增`getHeader(name, defaultValue)`方法，用于获取header默认值 
 - 新增：`SaRequest` 添加 `forward` 转发方法  

diff --git a/sa-token-doc/index.html b/sa-token-doc/index.html
@@ -46,7 +46,7 @@
 				<div class="content-box">
 					<div class="fenge"></div>
 					<!-- <img class="title-logo" src="./doc/logo.png" onclick="alert('别点我, 快去点star！')"> -->
-					<h1>Sa-Token<small>v1.25.0</small></h1>
+					<h1>Sa-Token<small>v1.26.0</small></h1>
 					<div class="sub-title">一个轻量级 java 权限认证框架，让鉴权变得简单、优雅！</div>
 					<div class="btn-box">
 						<a href="https://github.com/dromara/sa-token" target="_blank">GitHub</a>

diff --git a/sa-token-plugin/pom.xml b/sa-token-plugin/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-parent</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>pom</packaging>
 

diff --git a/sa-token-plugin/sa-token-alone-redis/pom.xml b/sa-token-plugin/sa-token-alone-redis/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-plugin</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml b/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-plugin</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-plugin/sa-token-dao-redis/pom.xml b/sa-token-plugin/sa-token-dao-redis/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-plugin</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-plugin/sa-token-oauth2/pom.xml b/sa-token-plugin/sa-token-oauth2/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-plugin</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-plugin/sa-token-quick-login/pom.xml b/sa-token-plugin/sa-token-quick-login/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-plugin</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-plugin/sa-token-spring-aop/pom.xml b/sa-token-plugin/sa-token-spring-aop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-plugin</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-plugin/sa-token-temp-jwt/pom.xml b/sa-token-plugin/sa-token-temp-jwt/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-plugin</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-starter/pom.xml b/sa-token-starter/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-parent</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>pom</packaging>
 

diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml b/sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-starter</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-starter/sa-token-servlet/pom.xml b/sa-token-starter/sa-token-servlet/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-starter</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-starter/sa-token-solon-plugin/pom.xml b/sa-token-starter/sa-token-solon-plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-starter</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/sa-token-starter/sa-token-spring-boot-starter/pom.xml b/sa-token-starter/sa-token-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-starter</artifactId>
-        <version>1.25.0</version>
+        <version>1.26.0</version>
     </parent>
     <packaging>jar</packaging>