v1.12.1更新

87292cb7 · shengzhang_ · 3b9f6b71 · 87292cb7 · 87292cb7 · 87292cb7
23 changed file
--- a/README.md
+++ b/README.md
 <p align="center">
    <img alt="logo" src="https://gitee.com/sz6/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.12.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.12.1</h1>
 <h4 align="center">这可能是史上功能最全的Java权限认证框架！</h4>
 <h4 align="center">
 	<a href="https://gitee.com/sz6/sa-token/stargazers"><img src="https://gitee.com/sz6/sa-token/badge/star.svg"></a>
-	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.12.0-2B9939"></a>
+	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.12.1-2B9939"></a>
 	<a href="https://github.com/click33/sa-token/stargazers"><img src="https://img.shields.io/github/stars/click33/sa-token"></a>
 	<a href="https://github.com/click33/sa-token/watchers"><img src="https://img.shields.io/github/watchers/click33/sa-token"></a>
 	<a href="https://github.com/click33/sa-token/network/members"><img src="https://img.shields.io/github/forks/click33/sa-token"></a>

--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
    <groupId>cn.dev33</groupId>
    <artifactId>sa-token-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.12.0</version>
+	<version>1.12.1</version>
 	
 	<!-- 项目介绍 -->
 	<name>sa-token</name>

--- 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.12.0</version>
+        <version>1.12.1</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
@@ -10,7 +10,7 @@ public class SaTokenConsts {
 	/**
 	 * sa-token 版本号 
 	 */
-	public static final String VERSION_NO = "v1.12.0";
+	public static final String VERSION_NO = "v1.12.1";

 	/**
 	 * sa-token 开源地址 

--- a/sa-token-dao-redis-jackson/pom.xml
+++ b/sa-token-dao-redis-jackson/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
        <groupId>cn.dev33</groupId>
        <artifactId>sa-token-parent</artifactId>
-        <version>1.12.0</version>
+        <version>1.12.1</version>
    </parent>
    <packaging>jar</packaging>

@@ -20,7 +20,7 @@
 		<dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency>
 		<!-- RedisTemplate 相关操作API -->
        <dependency>

--- a/sa-token-dao-redis/pom.xml
+++ b/sa-token-dao-redis/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
        <groupId>cn.dev33</groupId>
        <artifactId>sa-token-parent</artifactId>
-        <version>1.12.0</version>
+        <version>1.12.1</version>
    </parent>
    <packaging>jar</packaging>

@@ -20,7 +20,7 @@
 		<dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency>
 		<!-- RedisTemplate 相关操作API -->
        <dependency>

--- a/sa-token-demo-jwt/pom.xml
+++ b/sa-token-demo-jwt/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency>
        
        <!-- jwt -->
@@ -43,14 +43,14 @@
 		<!-- <dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-dao-redis</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency> -->
 		
 		<!-- sa-token整合redis (使用jackson序列化方式) -->
 		<!-- <dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-dao-redis-jackson</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency> -->
        
 		<!-- 提供redis连接池 -->
@@ -63,7 +63,7 @@
 		<!-- <dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-spring-aop</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency> -->

 		<!-- @ConfigurationProperties -->

--- a/sa-token-demo-springboot/pom.xml
+++ b/sa-token-demo-springboot/pom.xml
@@ -29,21 +29,21 @@
 		<dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency>
 		
 		<!-- sa-token整合redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-dao-redis</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency> -->
 		
 		<!-- sa-token整合redis (使用jackson序列化方式) -->
 		<!-- <dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-dao-redis-jackson</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency> -->
        
 		<!-- 提供redis连接池 -->
@@ -56,7 +56,7 @@
 		<!-- <dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-spring-aop</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency> -->

 		<!-- @ConfigurationProperties -->

--- a/sa-token-doc/doc/README.md
+++ b/sa-token-doc/doc/README.md
 <p align="center">
    <img alt="logo" src="https://gitee.com/sz6/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.12.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.12.1</h1>
 <h4 align="center">这可能是史上功能最全的Java权限认证框架！</h4>
 <h4 align="center">
 	<a href="https://gitee.com/sz6/sa-token/stargazers"><img src="https://gitee.com/sz6/sa-token/badge/star.svg"></a>
-	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.12.0-2B9939"></a>
+	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.12.1-2B9939"></a>
 	<a href="https://github.com/click33/sa-token/stargazers"><img src="https://img.shields.io/github/stars/click33/sa-token"></a>
 	<a href="https://github.com/click33/sa-token/watchers"><img src="https://img.shields.io/github/watchers/click33/sa-token"></a>
 	<a href="https://github.com/click33/sa-token/network/members"><img src="https://img.shields.io/github/forks/click33/sa-token"></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.12.0/doc/index.html">v1.12.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.11.0/doc/index.html">v1.11.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.10.0/doc/index.html">v1.10.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.9.0/doc/index.html">v1.9.0</option>
@@ -41,7 +42,7 @@
 		</div>
 		<script>
 			var name = '<img style="width: 50px; height: 50px; vertical-align: middle;" src="logo.png" alt="logo" /> ';
-			name += '<b style="font-size: 24px; vertical-align: middle;">sa-token</b> <sub>v1.12.0</sub>'
+			name += '<b style="font-size: 24px; vertical-align: middle;">sa-token</b> <sub>v1.12.1</sub>'
 			window.$docsify = {
 				name: name, // 名字 
 				repo: 'https://github.com/click33/sa-token', // github地址 

--- a/sa-token-doc/doc/more/update-log.md
+++ b/sa-token-doc/doc/more/update-log.md
@@ -7,6 +7,7 @@
 - 新增：新增身份临时切换功能，可在一个代码段内将会话临时切换为其它账号  **[重要]**
 - 优化：将`SaCheckInterceptor.java`更名为`SaAnnotationInterceptor.java`，更语义化的名称 
 - 优化：优化文档
+- 升级：v1.12.1，新增`SaRouterUtil`工具类，更方便的路由鉴权 


 ### 2021-1-10 @v1.11.0

--- a/sa-token-doc/doc/start/download.md
+++ b/sa-token-doc/doc/start/download.md
@@ -9,14 +9,14 @@
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-spring-boot-starter</artifactId>
-	<version>1.12.0</version>
+	<version>1.12.1</version>
 </dependency>
 ```

 ## Gradle依赖
 Gradle用户引入依赖：
 ```
-implementation 'cn.dev33:sa-token-spring-boot-starter:1.12.0'
+implementation 'cn.dev33:sa-token-spring-boot-starter:1.12.1'
 ```



--- a/sa-token-doc/doc/start/example.md
+++ b/sa-token-doc/doc/start/example.md
@@ -18,7 +18,7 @@
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-spring-boot-starter</artifactId>
-	<version>1.12.0</version>
+	<version>1.12.1</version>
 </dependency>
 ```


--- a/sa-token-doc/doc/use/at-check.md
+++ b/sa-token-doc/doc/use/at-check.md
@@ -21,7 +21,7 @@ sa-token内置两种模式完成注解鉴权，分别是`AOP模式`和`拦截器
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-spring-aop</artifactId>
-	<version>1.12.0</version>
+	<version>1.12.1</version>
 </dependency>
 ```


--- a/sa-token-doc/doc/use/dao-extend.md
+++ b/sa-token-doc/doc/use/dao-extend.md
@@ -11,7 +11,7 @@
 	<dependency>
 		<groupId>cn.dev33</groupId>
 		<artifactId>sa-token-dao-redis</artifactId>
-		<version>1.12.0</version>
+		<version>1.12.1</version>
 	</dependency>
 ```
 优点：兼容性好，缺点：session序列化后基本不可读，对开发者来讲等同于乱码
@@ -23,7 +23,7 @@
 	<dependency>
 		<groupId>cn.dev33</groupId>
 		<artifactId>sa-token-dao-redis-jackson</artifactId>
-		<version>1.12.0</version>
+		<version>1.12.1</version>
 	</dependency>
 ```
 优点：session序列化后可读性强，可灵活手动修改，缺点：兼容性稍差

--- a/sa-token-doc/doc/use/route-check.md
+++ b/sa-token-doc/doc/use/route-check.md
@@ -65,8 +65,8 @@ public class MySaTokenConfig implements WebMvcConfigurer {
 	// 注册sa-token的所有拦截器
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		// 根据路由划分模块，不同模块不同鉴权 
 		registry.addInterceptor(new SaRouteInterceptor((request, response, handler)->{
+			// 根据路由划分模块，不同模块不同鉴权 
 			SaRouterUtil.match("/user/**", () -> StpUtil.checkPermission("user"));
 			SaRouterUtil.match("/admin/**", () -> StpUtil.checkPermission("admin"));
 			SaRouterUtil.match("/goods/**", () -> StpUtil.checkPermission("goods"));
@@ -94,7 +94,7 @@ public class MySaTokenConfig implements WebMvcConfigurer {
 			// 登录验证 -- 拦截所有路由，并排除/user/doLogin 用于开放登录 
 			SaRouterUtil.match("/**", "/user/doLogin", () -> StpUtil.checkLogin());
 			
-			// 角色认证 -- 以/admin/** 开头的路由，必须具备[admin]角色或者[super-admin]角色才可以通过认证 
+			// 角色认证 -- 拦截以 admin 开头的路由，必须具备[admin]角色或者[super-admin]角色才可以通过认证 
 			SaRouterUtil.match("/admin/**", () -> StpUtil.checkRoleOr("admin", "super-admin"));
 			
 			// 权限认证 -- 不同模块, 校验不同权限 
@@ -105,6 +105,9 @@ public class MySaTokenConfig implements WebMvcConfigurer {
 			SaRouterUtil.match("/notice/**", () -> StpUtil.checkPermission("notice"));
 			SaRouterUtil.match("/comment/**", () -> StpUtil.checkPermission("comment"));
 			
+			// 匹配RESTful风格路由 
+			SaRouterUtil.match("/article/get/{id}", () -> StpUtil.checkPermission("article"));
+			
 		})).addPathPatterns("/**");
 	}
 }

--- a/sa-token-doc/index.html
+++ b/sa-token-doc/index.html
@@ -43,7 +43,7 @@
 			<!-- 内容部分 -->
 			<div class="main-box">
 				<div class="content-box">
-					<h1>sa-token<small>v1.12.0</small></h1>
+					<h1>sa-token<small>v1.12.1</small></h1>
 					<div class="sub-title">这可能是史上功能最全的Java权限认证框架！</div>
 					<!-- <p>0配置开箱即用，低学习成本</p> -->
 					<p>登录验证、权限验证、Session会话、踢人下线、集成Redis、前后台分离、模拟他人账号、临时身份切换、多账号体系、注解式鉴权、路由拦截式鉴权、花式token、自动续签、同端互斥登录、会话治理、Spring集成...</p>

--- a/sa-token-spring-aop/pom.xml
+++ b/sa-token-spring-aop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
        <groupId>cn.dev33</groupId>
        <artifactId>sa-token-parent</artifactId>
-        <version>1.12.0</version>
+        <version>1.12.1</version>
    </parent>
    <packaging>jar</packaging>

@@ -20,7 +20,7 @@
 		<dependency>
            <groupId>cn.dev33</groupId>
            <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.12.0</version>
+            <version>1.12.1</version>
        </dependency>
 		<!-- spring-boot-starter-aop -->
 		<dependency>

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

@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>cn.dev33</groupId>
 			<artifactId>sa-token-core</artifactId>
-			<version>1.12.0</version>
+			<version>1.12.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

--- a/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaAnnotationInterceptor.java
+++ b/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaAnnotationInterceptor.java
@@ -35,6 +35,7 @@ public class SaAnnotationInterceptor implements HandlerInterceptor {

 	/**
 	 * @param stpLogic 底层的 StpLogic 对象 
+	 * @return 拦截器自身
 	 */
 	public SaAnnotationInterceptor setStpLogic(StpLogic stpLogic) {
 		this.stpLogic = stpLogic;
@@ -45,7 +46,7 @@ public class SaAnnotationInterceptor implements HandlerInterceptor {
 	/**
 	 * 创建，并指定一个默认的 StpLogic 
 	 */
-	public  SaAnnotationInterceptor() {
+	public SaAnnotationInterceptor() {
 	}
 	
 	/**

--- a/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouteFunction.java
+++ b/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouteFunction.java
@@ -12,6 +12,9 @@ public interface SaRouteFunction {

 	/**
 	 * 执行验证的方法 
+	 * @param request request对象 
+	 * @param response response对象 
+	 * @param handler 处理对象 
 	 */
 	public void run(HttpServletRequest request, HttpServletResponse response, Object handler);


--- a/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouteInterceptor.java
+++ b/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouteInterceptor.java
@@ -78,6 +78,7 @@ public class SaRouteInterceptor implements HandlerInterceptor {

 	/**
 	 * @param stpLogic 底层的 StpLogic 对象 
+	 * @return 拦截器自身
 	 */
 	public SaRouteInterceptor setStpLogic(StpLogic stpLogic) {
 		this.stpLogic = stpLogic;
@@ -93,6 +94,7 @@ public class SaRouteInterceptor implements HandlerInterceptor {

 	/**
 	 * @param type 验证类型 (1=登录验证, 2=角色验证, 3=权限验证, 4=自定义验证) 
+	 * @return 拦截器自身
 	 */
 	public SaRouteInterceptor setType(int type) {
 		this.type = type;
@@ -108,6 +110,7 @@ public class SaRouteInterceptor implements HandlerInterceptor {

 	/**
 	 * @param mode 验证模式 AND | OR 
+	 * @return 拦截器自身
 	 */
 	public SaRouteInterceptor setMode(SaMode mode) {
 		this.mode = mode;
@@ -123,6 +126,7 @@ public class SaRouteInterceptor implements HandlerInterceptor {

 	/**
 	 * @param codes 标识码数组 
+	 * @return 拦截器自身
 	 */
 	public SaRouteInterceptor setCodes(String... codes) {
 		this.codes = codes;
@@ -138,6 +142,7 @@ public class SaRouteInterceptor implements HandlerInterceptor {

 	/**
 	 * @param function 设置自定义模式下的执行函数
+	 * @return 拦截器自身
 	 */
 	public SaRouteInterceptor setFunction(SaRouteFunction function) {
 		this.type = SaRouteInterceptor.CUSTOM;

--- a/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouterUtil.java
+++ b/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouterUtil.java
@@ -61,7 +61,7 @@ public class SaRouterUtil {

 	/**
 	 * 校验指定路由匹配符是否可以匹配成功指定路径   
-	 * @param pattern 路由匹配符 
+	 * @param patterns 路由匹配符 
 	 * @param path 需要匹配的路径集合 
 	 * @return 是否匹配成功 
 	 */
@@ -85,7 +85,7 @@ public class SaRouterUtil {

 	/**
 	 * 校验指定路由匹配符是否可以匹配成功当前URI 
-	 * @param pattern 路由匹配符 
+	 * @param patterns 路由匹配符 
 	 * @return 是否匹配成功 
 	 */
 	public static boolean isMatchCurrURI(List<String> patterns) {