lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-04-05 08:37:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v1.30.0.RC

Browse Source
This commit is contained in:
click33 2022-05-01 12:18:36 +08:00
parent a7ef71737e
commit 21147043f2
38 changed files with 135 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,7 +1,7 @@
<p align="center">
<img alt="logo" src="https://sa-token.dev33.cn/doc/logo.png" width="150" height="150">
</p>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.29.0</h1>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.30.0.RC</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>

87
mvn clean.bat
View File

@ -5,75 +5,24 @@ call mvn clean
:: demo模块clean
cd sa-token-demo
cd sa-token-demo-jwt
call mvn clean
cd ..
cd sa-token-demo-springboot
call mvn clean
cd ..
cd sa-token-demo-webflux
call mvn clean
cd ..
cd sa-token-demo-solon
call mvn clean
cd ..
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-alone-redis
call mvn clean
cd ..
cd sa-token-demo-thymeleaf
call mvn clean
cd ..
cd sa-token-demo-sso-server
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 ..
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 ..
cd sa-token-demo-springboot & call mvn clean & cd ..
cd sa-token-demo-webflux & call mvn clean & cd ..
cd sa-token-demo-solon & call mvn clean & cd ..
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-alone-redis & call mvn clean & cd ..
cd sa-token-demo-thymeleaf & call mvn clean & cd ..
cd sa-token-demo-sso-server & 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 ..
cd sa-token-demo-sso3-client-nosdk & 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 ..
cd sa-token-demo-websocket & call mvn clean & cd ..
cd sa-token-demo-websocket-spring & call mvn clean & cd ..
cd ..

2
pom.xml
View File

@ -37,7 +37,7 @@
<!-- 一些属性 -->
<properties>
<revision>1.29.1.trial</revision>
<revision>1.30.0.RC</revision>
<jdk.version>1.8</jdk.version>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>

10
sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
View File

@ -26,12 +26,16 @@ public class SaFoxUtil {
* 打印 Sa-Token 版本字符画
*/
public static void printSaToken() {
String str = "____ ____ ___ ____ _ _ ____ _ _ \r\n" + "[__ |__| __ | | | |_/ |___ |\\ | \r\n"
String str = ""
+ "____ ____ ___ ____ _ _ ____ _ _ \r\n"
+ "[__ |__| __ | | | |_/ |___ |\\ | \r\n"
+ "___] | | | |__| | \\_ |___ | \\| "
// + SaTokenConsts.VERSION_NO
// + "sa-token："
+ "\r\n" + "DevDoc：" + SaTokenConsts.DEV_DOC_URL // + "\r\n";
// + "\r\n" + "DevDoc：" + SaTokenConsts.DEV_DOC_URL // + "\r\n";
+ "\r\n" + SaTokenConsts.DEV_DOC_URL // + "\r\n";
+ " (" + SaTokenConsts.VERSION_NO + ")"
+ "\r\n" + "GitHub：" + SaTokenConsts.GITHUB_URL // + "\r\n";
// + "\r\n" + "GitHub：" + SaTokenConsts.GITHUB_URL // + "\r\n";
;
System.out.println(str);
}

9
sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
View File

@ -13,10 +13,15 @@ public class SaTokenConsts {
/**
* Sa-Token 当前版本号
*/
public static final String VERSION_NO = "v1.29.1.trial";
public static final String VERSION_NO = "v1.30.0.RC";
/**
* Sa-Token 开源地址
* Sa-Token 开源地址 Gitee
*/
public static final String GITEE_URL = "https://gitee.com/dromara/sa-token";
/**
* Sa-Token 开源地址 GitHub
*/
public static final String GITHUB_URL = "https://github.com/dromara/sa-token";

4
sa-token-demo/sa-token-demo-alone-redis/pom.xml
View File

@ -10,13 +10,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

2
sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
View File

@ -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.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

2
sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
View File

@ -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.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

4
sa-token-demo/sa-token-demo-jwt/pom.xml
View File

@ -10,13 +10,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

2
sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/SaTokenJwtDemoApplication.java
View File

@ -10,7 +10,7 @@ public class SaTokenJwtDemoApplication {
public static void main(String[] args) {
SpringApplication.run(SaTokenJwtDemoApplication.class, args);
System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
}
}

2
sa-token-demo/sa-token-demo-oauth2-client/pom.xml
View File

@ -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.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

2
sa-token-demo/sa-token-demo-oauth2-server/pom.xml
View File

@ -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.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

4
sa-token-demo/sa-token-demo-quick-login/pom.xml
View File

@ -10,13 +10,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<!-- <version>2.6.0</version> -->
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

2
sa-token-demo/sa-token-demo-solon/pom.xml
View File

@ -9,7 +9,7 @@
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

4
sa-token-demo/sa-token-demo-springboot/pom.xml
View File

@ -10,14 +10,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<!-- <version>1.5.9.RELEASE</version> -->
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

5
sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/current/NotFoundHandle.java
View File

@ -18,11 +18,6 @@ import cn.dev33.satoken.util.SaResult;
@RestController
public class NotFoundHandle implements ErrorController {
@Override
public String getErrorPath() {
return "/error";
}
@RequestMapping("/error")
public Object error(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.setStatus(200);

4
sa-token-demo/sa-token-demo-sso-server/pom.xml
View File

@ -10,13 +10,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

4
sa-token-demo/sa-token-demo-sso1-client/pom.xml
View File

@ -10,13 +10,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

4
sa-token-demo/sa-token-demo-sso2-client/pom.xml
View File

@ -10,13 +10,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

4
sa-token-demo/sa-token-demo-sso3-client/pom.xml
View File

@ -10,13 +10,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

4
sa-token-demo/sa-token-demo-thymeleaf/pom.xml
View File

@ -10,13 +10,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

4
sa-token-demo/sa-token-demo-webflux/pom.xml
View File

@ -10,13 +10,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

1
sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/DefineRoutes.java
View File

@ -19,6 +19,7 @@ public class DefineRoutes {
* 函数式编程，初始化路由表
* @return 路由表
*/
@SuppressWarnings("deprecation")
@Bean
public RouterFunction<ServerResponse> getRoutes() {
return RouterFunctions.route(RequestPredicates.GET("/fun"), req -> {

4
sa-token-demo/sa-token-demo-websocket-spring/pom.xml
View File

@ -10,14 +10,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<!-- <version>1.5.9.RELEASE</version> -->
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

4
sa-token-demo/sa-token-demo-websocket/pom.xml
View File

@ -10,14 +10,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<!-- <version>1.5.9.RELEASE</version> -->
<relativePath/>
</parent>
<!-- 定义sa-token版本号 -->
<properties>
<sa-token-version>1.29.1.trial</sa-token-version>
<sa-token-version>1.30.0.RC</sa-token-version>
</properties>
<dependencies>

2
sa-token-doc/doc/README.md
View File

@ -1,7 +1,7 @@
<p align="center">
<img alt="logo" src="https://sa-token.dev33.cn/doc/logo.png" width="150" height="150">
</p>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.29.1.trial</h1>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.30.0.RC</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>

5
sa-token-doc/doc/index.html
View File

@ -20,7 +20,7 @@
<div class="logo-box">
<img src="logo.png" title="logo" />
<h1 class="logo-text">Sa-Token</h1>
<sub>v1.29.1.trial</sub>
<sub>v1.30.0.RC</sub>
</div>
</a>
</div>
@ -30,6 +30,7 @@
</div>
<select class="p-none" 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.29.0/doc/index.html">v1.29.0</option>
<option value="http://sa-token.dev33.cn/v/v1.28.0/doc/index.html">v1.28.0</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>
@ -113,7 +114,7 @@
<!-- -->
<script src="./lib/docsify-plugin.js"></script>
<script>
var saTokenTopVersion = '1.29.1.trial'; // Sa-Token最新版本
var saTokenTopVersion = '1.30.0.RC'; // 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 = {

7
sa-token-doc/doc/more/sa-token-donate.md
View File

@ -19,12 +19,15 @@ Sa-Token 采用 Apache-2.0 开源协议，**承诺框架本身与官网文档永
| 赞助人 | 赞助金额 | 留言 | 时间 |
| :-------- | :-------- | :-------- | :-------- |
| [李洪星](https://gitee.com/li_hong_xing) | ¥ 10.0 | 解决了很多之前项目中遇到的问题。感谢您的开源项目！ | 2022-04-29 |
| [乡村阿土哥](https://gitee.com/895995040) | ¥ 10.0 | 感谢您的开源项目！ | 2022-04-29 |
| [Horatio201](https://gitee.com/horatio201) | ¥ 20.0 | 太牛了！ | 2022-04-25 |
| [阿文](https://gitee.com/qq921124136) | ¥ 20.0 | 很好的框架，在开发文档里学到了很多知识点 | 2022-04-21 |
| 行长 （微信打赏） | ¥ 20.0 | 微信打赏 | 2022-04-15 |
| [xq584](https://gitee.com/xq584) | ¥ 10.0 | 感谢您的开源项目！ | 2022-04-08 |
| [xq584](https://gitee.com/xq584) | ¥ 10.0 | 感谢您的开源项目！ | 2022-04-08 |
| [yukihane](https://gitee.com/yukihane) | ¥ 10.0 | 感谢您的开源项目！ | 2022-04-07 |
| [alkinn](https://gitee.com/alkinn) | ¥ 10.0 | 感谢您的开源项目！ | 2022-03-29 |
| [lele](https://gitee.com/lelez) | ¥ 10.0 | 感谢您的开源项目！ | 2022-03-29 |
| [lele](https://gitee.com/lelez) | ¥ 10.0 | 感谢您的开源项目！ | 2022-03-29 |
| Robin Tin （微信打赏） | ¥ 28.88 | 微信打赏 | 2022-03-24 |
| [刘嘉威](https://gitee.com/liu_jiawei) | ¥ 6.66 | 真滴好用~ | 2022-03-23 |
| 秦政 （微信打赏） | ¥ 20.00 | 微信打赏 | 2022-03-22 |

45
sa-token-doc/doc/more/update-log.md
View File

@ -1,5 +1,50 @@
# 更新日志
### 2022-05-01 @v1.30.0
- 新增：新增集成 Web-Socket 鉴权示例。 **[重要]**
- 新增：新增集成 Web-Socket（Spring封装版） 鉴权示例。
- 新增：新增 jfinal 集成包 `sa-token-jfinal-plugin` **[重要]**
- 新增：新增 jboot 集成包 `sa-token-jboot-plugin` （感谢 @nxstv 提交的pr）
- 修复：修复整合 sa-token-jwt Style 模式时，`StpUtil.getExtra("key")` 无效的bug
- 升级：升级 `sa-token-context-dubbo` dubbo版本：`2.7.11` -> `2.7.15`
- 升级：借助 `flatten-maven-plugin` 统一版本号定义 （感谢 @ruansheng8 提交的pr） **[重要]**
- 修复：修复在 `springboot 2.6.x` 下 `quick-login` 插件循环依赖无法启动的问题
- 优化：`sa-token-spring-aop` 依赖改为 `sa-token-core`，避免在webflux环境下启动报错的问题
- 优化：源码注释 设备标识 改为 设备类型 更符合语义
- 修复：解决部分协议下 dubbo 参数变为小写导致 `Id-Token` 鉴权无效的问题
- 升级：单元测试升级为 JUnit5
- 新增：新增 `maxLoginCount` 配置，指定同一账号可同时在线的最大数量 **[重要]**
- 升级：彻底删除 SaTokenAction 接口，完全由 SaStrategy 代替
- 新增：新增 `sa-token-dao-redisx` 插件，感谢 @noear 提交的pr **[重要]**
- 优化：增加 parseToken 未配置 jwt 密钥时的异常提示，感谢 @BATTLEHAWK00 提交的pr
- 优化：sso,oauth2 插件中调用配置类使用 getter 方法，感谢 @Naah 提交的pr
- 新增：新增 json 转换器模块
- 重构：SaTokenListener#doLogin 方法新增 tokenValue 参数 **[不向下兼容]**
- 升级：SpringBoot 相关组件依赖版本升级至 `2.5.12`
- 文档：在线文档所有 `AjaxJson` 改为 `SaResult`
- 文档：“多账号认证” -> 改为 “多账户认证”
- 升级：顶级异常类 `SaTokenException` 增加 code 异常细分状态码。 **[重要]**
- **注意升级：受异常细分状态码影响，`NotPermissionException` 类中 `getCode()` 方法改为 `getPermission()`。** **[不向下兼容]**
- SSO 模块升级：
- 重构：SSO 模块从核心包拆分为独立插件 `sa-token-sso` **[重要]**
- 优化：SSO模式三单点注销回调方法中，注销语句改为：`stpLogic.logout(loginId)` 更符合情景
- 修复：解决 sso 构建认证地址时，部分 Servlet 版本内部实现不一致带来的双 back 参数问题。
- 升级：SSO 模块提供精细化异常处理
- 重构：SSO 模式三接口 `/sso/checkTicket`、`/sso/logout`，更改响应体格式 **[不向下兼容]**
- 优化：SSO 模式三单点注销搭建示例增加 `try-catch`，提高容错性
- 优化：`SsoUtil.singleLogout` 改为 `SsoUtil.ssoLogout`，且无需再提供 secretkey 参数 **[不向下兼容]**
- 升级：将 SSO 模式三的接口调用改为签名式校验。 **[重要]** **[不向下兼容]**
- 新增：新增 SSO 模式三下无 sdk 的对接示例， 感谢 @Sa-药水 的建议反馈 **[重要]**
- sa-token-jwt 模块升级：
- 重构：`sa-token-jwt` 的创建，强制校验loginType **[不向下兼容]**
- 重构：`StpLogicJwtForStateless` 由重写 login 方法改为重写 createLoginSession
- 重构：`SaJwtUtil` 工具类不再吞并异常消息，且提供精细化异常 code 码。
- 重构：改名：StpLogicJwtForStyle -> StpLogicJwtForSimple
- 重构：改名：StpLogicJwtForMix -> StpLogicJwtForMixin
- 修复：修复 `StpLogicJwtForSimple` 模式下 Extra 数据可能受到旧 token 影响的bug
### 2022-02-10 @v1.29.0
- 升级：sa-token-jwt插件可在登录时添加额外数据。
- 重构：优化Dubbo调用时向下传递Token的规则，可避免在项目启动时由于Context无效引发的bug。

4
sa-token-doc/index.html
View File

@ -23,7 +23,7 @@
<img src="./doc/logo.png" title="logo" />
<span class="logo-text">Sa-Token</span>
<!-- <h1 class="logo-text">Sa-Token</h1> -->
<!-- <sub>v1.29.1.trial</sub> -->
<!-- <sub>v1.30.0.RC</sub> -->
</div>
</a>
</div>
@ -69,7 +69,7 @@
<div class="main-box">
<div class="content-box">
<div class="fenge"></div>
<h1>Sa-Token<small>v1.29.1.trial</small></h1>
<h1>Sa-Token<small>v1.30.0.RC</small></h1>
<div class="sub-title">一个轻量级 java 权限认证框架，让鉴权变得简单、优雅！</div>
<div class="btn-box">
<a href="https://github.com/dromara/sa-token" target="_blank">GitHub</a>

2
sa-token-plugin/pom.xml
View File

@ -37,7 +37,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<optional>true</optional>
</dependency>
</dependencies>

2
sa-token-plugin/sa-token-dialect-thymeleaf/pom.xml
View File

@ -34,7 +34,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<optional>true</optional>
</dependency>
</dependencies>

5
sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
View File

@ -122,6 +122,11 @@ public class SaJwtUtil {
*/
public static JWT parseToken(String token, String loginType, String keyt, boolean isCheckTimeout) {
// 秘钥不可以为空
if(keyt == null) {
throw new SaJwtException("请配置 jwt 秘钥");
}
// 如果token为null
if(token == null) {
throw new SaJwtException("jwt 字符串不可为空");

2
sa-token-plugin/sa-token-quick-login/pom.xml
View File

@ -27,7 +27,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
</dependency>
</dependencies>

2
sa-token-plugin/sa-token-spring-aop/pom.xml
View File

@ -27,7 +27,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
</dependency>
</dependencies>

2
sa-token-plugin/sa-token-temp-jwt/pom.xml
View File

@ -33,7 +33,7 @@
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<optional>true</optional>
</dependency> -->
</dependencies>

6
sa-token-starter/sa-token-reactor-spring-boot-starter/pom.xml
View File

@ -27,7 +27,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<optional>true</optional>
</dependency>
<!-- spring-web -->
@ -71,14 +71,14 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<optional>true</optional>
</dependency>
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
</dependency> -->
</dependencies>

2
sa-token-starter/sa-token-spring-boot-starter/pom.xml
View File

@ -46,7 +46,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.5.12</version>
<optional>true</optional>
</dependency>
</dependencies>