v1.28.0 更新

2024-11-29 18:37:49 +08:00 · 2021-11-06 00:08:07 +08:00 · 2021-11-06 00:08:07 +08:00 · d3113ed6c9
commit d3113ed6c9
parent 8ad2e3db96
42 changed files with 79 additions and 46 deletions
--- 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.27.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.28.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>
--- a/clean.bat
+++ b/clean.bat
@ -61,6 +61,20 @@ cd sa-token-demo-jwt
 call mvn clean
 cd ..

+cd sa-token-demo-jwt
+call mvn clean
+cd ..
+
+
+cd sa-token-demo-dubbo-provider
+call mvn clean
+cd ..
+
+cd sa-token-demo-dubbo-consumer
+call mvn clean
+cd ..
+
+



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

--- 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.27.1";
+	public static final String VERSION_NO = "v1.28.0";

 	/**
 	 * Sa-Token 开源地址 
--- 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.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>

 	<dependencies>
--- a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
@ -16,6 +16,7 @@
 	<properties> 
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>
 	
 	<dependencies>
@ -30,14 +31,14 @@
 		<dependency>
 			<groupId>cn.dev33</groupId>
 			<artifactId>sa-token-spring-boot-starter</artifactId>
-			<version>1.27.0</version>
+            <version>${sa-token-version}</version>
 		</dependency>
 		
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-dao-redis-jackson</artifactId>
-           	<version>1.27.0</version>
+            <version>${sa-token-version}</version>
        </dependency>
 		<dependency>
            <groupId>org.apache.commons</groupId>
@ -67,7 +68,7 @@
 		<dependency>
 			<groupId>cn.dev33</groupId>
 			<artifactId>sa-token-context-dubbo</artifactId>
-			<version>1.27.0</version>
+            <version>${sa-token-version}</version>
 		</dependency>
 		
 	</dependencies>
--- a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
@ -16,6 +16,7 @@
 	<properties> 
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>
 	
 	<dependencies>
@ -30,14 +31,14 @@
 		<dependency>
 			<groupId>cn.dev33</groupId>
 			<artifactId>sa-token-spring-boot-starter</artifactId>
-			<version>1.27.0</version>
+            <version>${sa-token-version}</version>
 		</dependency>
 		
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-dao-redis-jackson</artifactId>
-           	<version>1.27.0</version>
+            <version>${sa-token-version}</version>
        </dependency>
 		<dependency>
            <groupId>org.apache.commons</groupId>
@ -67,7 +68,7 @@
 		<dependency>
 			<groupId>cn.dev33</groupId>
 			<artifactId>sa-token-context-dubbo</artifactId>
-			<version>1.27.0</version>
+            <version>${sa-token-version}</version>
 		</dependency>
 		
 	</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.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>

 	<dependencies>
--- 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.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>
 	
 	<dependencies>
--- 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.27.0</sa-token-version>
+		<sa-token-version>1.28.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
@ -15,7 +15,7 @@
 	
 	<!-- 定义sa-token版本号 -->
 	<properties>
-		<sa-token-version>1.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>

 	<dependencies>
--- 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.27.0</sa-token-version>
+		<sa-token-version>1.28.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.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>

 	<dependencies>
--- 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.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>

 	<dependencies>
--- 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.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>

 	<dependencies>
--- 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.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>

 	<dependencies>
--- 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.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>

 	<dependencies>
--- 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.27.0</sa-token-version>
+		<sa-token-version>1.28.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.27.0</sa-token-version>
+		<sa-token-version>1.28.0</sa-token-version>
 	</properties>

 	<dependencies>
--- 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.27.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.28.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>
--- a/sa-token-doc/doc/index.html
+++ b/sa-token-doc/doc/index.html
@ -22,6 +22,7 @@
 		<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.27.0/doc/index.html">v1.27.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.26.0/doc/index.html">v1.26.0</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>
@ -61,7 +62,7 @@
 		</div>
 		
 		<script>
-			var saTokenTopVersion = '1.27.0';	// Sa-Token最新版本 
+			var saTokenTopVersion = '1.28.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/doc/more/update-log.md
+++ b/sa-token-doc/doc/more/update-log.md
@ -1,6 +1,20 @@
 # 更新日志 


+### 2021-11-5 @v1.28.0
+- 新增：新增 `sa-token-jwt` 插件，用于与jwt的整合 **[重要]**
+- 新增：新增 `sa-token-context-dubbo` 插件，用于与 Dubbo 的整合 **[重要]**
+- 文档：文档新增章节：Sa-Token 插件开发指南 **[重要]**
+- 文档：文档新增章节：名称解释
+- 优化：抽离 `getSaTokenDao()` 方法，方便重写 
+- 新增：单元测试新增多账号模式数据不互通测试
+- 优化：优化在线文档，修复部分错误之处 	
+- 优化：优化未登录异常抛出提示，标注无效的Token值 
+- 修复：修复单词拼写错误 `getDeviceOrDefault` 
+- 优化：优化 jwt 集成示例 
+- 文档：新增常见问题总结
+
+
 ### 2021-10-11 @v1.27.0
 - 升级：增强 SaRouter 链式匹配能力  	**[重要]**  	
 - 新增：新增插件 Thymeleaf 标签方言   **[重要]**  	
--- 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.27.0</small></h1>
+					<h1>Sa-Token<small>v1.28.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>
--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>pom</packaging>
    
--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- a/sa-token-plugin/sa-token-context-dubbo/pom.xml
+++ b/sa-token-plugin/sa-token-context-dubbo/pom.xml
@ -7,7 +7,7 @@
 	<parent>
        <groupId>cn.dev33</groupId>
        <artifactId>sa-token-plugin</artifactId>
-        <version>1.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- a/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml
@ -7,7 +7,7 @@
 	<parent>
        <groupId>cn.dev33</groupId>
        <artifactId>sa-token-plugin</artifactId>
-        <version>1.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- a/sa-token-plugin/sa-token-jwt/pom.xml
+++ b/sa-token-plugin/sa-token-jwt/pom.xml
@ -7,7 +7,7 @@
 	<parent>
        <groupId>cn.dev33</groupId>
        <artifactId>sa-token-plugin</artifactId>
-        <version>1.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
@ -20,7 +20,6 @@ public class StpLogicJwtForStateless extends StpLogic {

 	/**
 	 * Sa-Token 整合 jwt -- stateless 无状态 
-	 * @param loginType 账号体系标识 
 	 */
 	public StpLogicJwtForStateless() {
 		super(StpUtil.TYPE);
--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
@ -256,10 +256,13 @@ public class SaOAuth2Handle {
 		ra.loginId = StpUtil.getLoginId();
 		ra.scope = req.getParam(Param.scope, "");

-		// 6、生成 Access-Token
+		// 6、校验 ClientScope
+		SaOAuth2Util.checkContract(clientId, ra.scope);
+
+		// 7、生成 Access-Token
 		AccessTokenModel at = SaOAuth2Util.generateAccessToken(ra, true);

-		// 7、返回 Access-Token
+		// 8、返回 Access-Token
 		return SaResult.data(at.toLineMap());
 	}

--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>pom</packaging>
    
--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>

--- 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.27.0</version>
+        <version>1.28.0</version>
    </parent>
    <packaging>jar</packaging>