v1.37.0 update

This commit is contained in:
click33
2023-10-18 13:22:36 +08:00
parent f5307a2eb0
commit e076c71648
49 changed files with 85 additions and 85 deletions

View File

@@ -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.36.0</h1>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.37.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>

View File

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

View File

@@ -13,7 +13,7 @@
<url>https://github.com/dromara/sa-token</url>
<properties>
<revision>1.36.0</revision>
<revision>1.37.0</revision>
</properties>
<dependencyManagement>

View File

@@ -36,7 +36,7 @@ public class SaTokenConsts {
/**
* Sa-Token 当前版本号
*/
public static final String VERSION_NO = "v1.36.0";
public static final String VERSION_NO = "v1.37.0";
/**
* Sa-Token 开源地址 Gitee

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -17,7 +17,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>
@@ -73,7 +73,7 @@
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-bom</artifactId>
<version>1.36.0</version>
<version>1.37.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>

View File

@@ -17,7 +17,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<java.run.main.class>com.pj.SaTokenCrossCookieApplication</java.run.main.class>
</properties>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<java.run.main.class>com.pj.SaTokenCrossHeaderApplication</java.run.main.class>
</properties>

View File

@@ -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.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<dubbo.version>2.7.21</dubbo.version>
<nacos.version>1.4.2</nacos.version>
</properties>

View File

@@ -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.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<dubbo.version>2.7.21</dubbo.version>
<nacos.version>1.4.2</nacos.version>
</properties>

View File

@@ -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.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<dubbo.version>3.2.2</dubbo.version>
<nacos.version>2.2.2</nacos.version>
</properties>

View File

@@ -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.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<dubbo.version>3.2.2</dubbo.version>
<nacos.version>2.2.2</nacos.version>
</properties>

View File

@@ -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.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

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.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

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.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -17,7 +17,7 @@
</parent>
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

View File

@@ -17,7 +17,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -17,7 +17,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -17,7 +17,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<solon.version>2.2.3</solon.version>
</properties>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -18,7 +18,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
<java.run.main.class>com.pj.SaTokenApplication</java.run.main.class>
</properties>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -16,7 +16,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -17,7 +17,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -17,7 +17,7 @@
<!-- 定义 Sa-Token 版本号 -->
<properties>
<sa-token.version>1.36.0</sa-token.version>
<sa-token.version>1.37.0</sa-token.version>
</properties>
<dependencies>

View File

@@ -12,7 +12,7 @@
<description>Sa-Token Dependencies</description>
<properties>
<revision>1.36.0</revision>
<revision>1.37.0</revision>
<!-- 统一定义依赖版本号 -->
<springboot.version>2.5.15</springboot.version>

View File

@@ -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.36.0</h1>
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.37.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>

View File

@@ -18,7 +18,7 @@
<div class="logo-box">
<img src="logo.png" title="logo" />
<h1 class="logo-text">Sa-Token</h1>
<sub>v1.36.0</sub>
<sub>v1.37.0</sub>
</div>
</a>
</div>
@@ -28,6 +28,7 @@
</div>
<select class="select-version p-none" onchange="location.href=this.value">
<option value="doc.html">最新版</option>
<option value="v/v1.36.0/doc.html">v1.36.0</option>
<option value="v/v1.35.0/doc.html">v1.35.0</option>
<option value="v/v1.34.0/doc.html">v1.34.0</option>
<option value="v/v1.33.0/doc.html">v1.33.0</option>
@@ -166,7 +167,7 @@
<script src="./static/docsify-plugin.js?v=6"></script>
<script src="./static/is-star-plugin.js?v=6"></script>
<script>
var saTokenTopVersion = '1.36.0'; // Sa-Token最新版本
var saTokenTopVersion = '1.37.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 = {

View File

@@ -109,7 +109,7 @@
<div class="main-box">
<div class="content-box">
<!-- <div class="fenge"></div> -->
<h1>Sa-Token<small>v1.36.0</small></h1>
<h1>Sa-Token<small>v1.37.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>
@@ -159,7 +159,7 @@
<p>提供 Redis 集成方案、项目重启数据不丢失、多系统数据互通,可自定义数据持久化策略</p>
</div>
<div class="feature">
<h2>🚀️ 前后端分离</h2>
<h2>🚀️ 前后端分离</h2>
<p>内置多种 Token 读取策略适配APP、小程序、SPA单页应用等前后端分离场景</p>
</div>
<div class="feature">

View File

@@ -1,5 +1,12 @@
# 更新日志
### v1.37.0 @2023-10-18
- 修复:修复路由拦截鉴权可被绕过的问题。 **[漏洞修复]**
- 重构:未登录时调用鉴权 API 抛出未登录异常而不再是无权限异常。
- 优化:优化 SaTokenDao 组件更换时的逻辑。
- 文档:提供 SpringBoot3.x 路由匹配出错的解决方案。
### v1.36.0 @2023-9-22
- sa-token-core
- 修复API接口签名校验参数接口NPE问题增加必须参数的非空校验处理。

View File

@@ -5,14 +5,14 @@
---
### 正式版本
v1.36.0 正式版,可上生产:
v1.37.0 正式版,可上生产:
``` xml
<!-- Sa-Token 权限认证 -->
<dependency>
<groupId>cn.dev33</groupId>
<artifactId>sa-token-spring-boot-starter</artifactId>
<version>1.36.0</version>
<version>1.37.0</version>
</dependency>
```

View File

@@ -74,10 +74,10 @@ public class SaTokenActionHandler extends ActionHandler {
// Controller controller = action.getControllerClass().newInstance();
controller = controllerFactory.getController(action.getControllerClass());
CPI._init_(controller, action, request, response, urlPara[0]);
if (resolveJson && controller.isJsonRequest()) {
// 注入 JsonRequest 包装对象接管 request
controller.setHttpServletRequest(jsonRequestFactory.apply(controller.getRawData(), controller.getRequest()));
}
// if (resolveJson && controller.isJsonRequest()) {
// // 注入 JsonRequest 包装对象接管 request
// controller.setHttpServletRequest(jsonRequestFactory.apply(controller.getRawData(), controller.getRequest()));
// }
//加入SaToken上下文处理
SaControllerContext.hold(controller);
if (devMode) {

View File

@@ -15,13 +15,22 @@
*/
package cn.dev33.satoken.springboot;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletException;
import cn.dev33.satoken.SaManager;
import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.context.SaTokenContext;
import cn.dev33.satoken.dao.SaTokenDao;
import cn.dev33.satoken.exception.*;
import cn.dev33.satoken.filter.SaServletFilter;
import cn.dev33.satoken.json.SaJsonTemplate;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.spring.SpringMVCUtil;
import cn.dev33.satoken.spring.pathmatch.SaPathMatcherHolder;
import cn.dev33.satoken.stp.SaLoginConfig;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpLogic;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.util.SaTokenConsts;
import cn.dev33.satoken.util.SoMap;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
@@ -31,28 +40,11 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.mock.web.MockFilterChain;
import org.springframework.util.PathMatcher;
import cn.dev33.satoken.SaManager;
import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.context.SaTokenContext;
import cn.dev33.satoken.dao.SaTokenDao;
import cn.dev33.satoken.exception.DisableServiceException;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.exception.NotPermissionException;
import cn.dev33.satoken.exception.NotRoleException;
import cn.dev33.satoken.exception.NotSafeException;
import cn.dev33.satoken.exception.SaJsonConvertException;
import cn.dev33.satoken.exception.SaTokenException;
import cn.dev33.satoken.filter.SaServletFilter;
import cn.dev33.satoken.json.SaJsonTemplate;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.spring.SaPathMatcherHolder;
import cn.dev33.satoken.spring.SpringMVCUtil;
import cn.dev33.satoken.stp.SaLoginConfig;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpLogic;
import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.util.SaTokenConsts;
import cn.dev33.satoken.util.SoMap;
import javax.servlet.ServletException;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* Sa-Token 基础API测试

View File

@@ -15,9 +15,9 @@
*/
package cn.dev33.satoken.springboot;
import cn.dev33.satoken.spring.SaPathMatcherHolder;
import cn.dev33.satoken.spring.SaPathPatternParserUtil;
import cn.dev33.satoken.spring.SaPatternsRequestConditionHolder;
import cn.dev33.satoken.spring.pathmatch.SaPathMatcherHolder;
import cn.dev33.satoken.spring.pathmatch.SaPathPatternParserUtil;
import cn.dev33.satoken.spring.pathmatch.SaPatternsRequestConditionHolder;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;