From d01db3442b8f416612d24f7e6c185911e2cfdf27 Mon Sep 17 00:00:00 2001
From: shengzhang <2393584716@qq.com>
Date: Sat, 24 Apr 2021 00:53:39 +0800
Subject: [PATCH] =?UTF-8?q?v1.18.0=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                        |  2 +-
 pom.xml                                          |  4 ++--
 sa-token-core/pom.xml                            |  2 +-
 .../java/cn/dev33/satoken/util/SaFoxUtil.java    |  4 ++--
 .../cn/dev33/satoken/util/SaTokenConsts.java     |  2 +-
 sa-token-dao-redis-jackson/pom.xml               |  2 +-
 sa-token-dao-redis/pom.xml                       |  2 +-
 sa-token-demo-jwt/pom.xml                        |  2 +-
 sa-token-demo-springboot/pom.xml                 |  2 +-
 sa-token-demo-webflux/pom.xml                    |  2 +-
 sa-token-doc/doc/README.md                       |  2 +-
 sa-token-doc/doc/index.html                      |  3 ++-
 sa-token-doc/doc/more/tj-gzh.md                  |  6 +++++-
 sa-token-doc/doc/more/update-log.md              | 12 ++++++++++++
 sa-token-doc/doc/start/download.md               | 16 ++++++++--------
 sa-token-doc/doc/start/example.md                |  2 +-
 sa-token-doc/doc/start/webflux-example.md        |  2 +-
 sa-token-doc/doc/use/at-check.md                 |  2 +-
 sa-token-doc/doc/use/dao-extend.md               |  4 ++--
 sa-token-doc/index.html                          |  2 +-
 sa-token-oauth2/pom.xml                          |  2 +-
 sa-token-reactor-spring-boot-starter/pom.xml     |  2 +-
 .../satoken/reactor/filter/SaReactorFilter.java  |  2 +-
 sa-token-servlet/pom.xml                         |  2 +-
 sa-token-spring-aop/pom.xml                      |  2 +-
 sa-token-spring-boot-starter/pom.xml             |  2 +-
 .../cn/dev33/satoken/filter/SaServletFilter.java |  2 +-
 27 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 80f4bb24..244158f6 100644
--- 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.17.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.18.0</h1>
 <h4 align="center">这可能是史上功能最全的 Java 权限认证框架！</h4>
 <h4 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
index b0ad0a77..02ac347e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <groupId>cn.dev33</groupId>
     <artifactId>sa-token-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.17.0</version>
+	<version>1.18.0</version>
 	
 	<!-- 项目介绍 -->
 	<name>sa-token</name>
@@ -40,7 +40,7 @@
 	
 	<!-- 一些属性 -->
 	<properties>
-		<sa-token-version>1.17.0</sa-token-version>
+		<sa-token-version>1.18.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
index 08791da7..0c27a53c 100644
--- 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.17.0</version>
+        <version>1.18.0</version>
     </parent>
     <packaging>jar</packaging>
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
index fc134d3d..7569efd8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
@@ -133,8 +133,8 @@ public class SaFoxUtil {
 	/**
 	 * 字符串模糊匹配
 	 * <p>example:
-	 * <p> user* user-add   -> true 
-	 * <p> user* art-add    -> false  
+	 * <p> user* user-add   --  true 
+	 * <p> user* art-add    --  false  
 	 * @param patt 表达式
 	 * @param str 待匹配的字符串
 	 * @return 是否可以匹配 
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
index 8c071d5d..9ded4c56 100644
--- 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.17.0";
+	public static final String VERSION_NO = "v1.18.0";
 
 	/**
 	 * sa-token 开源地址 
diff --git a/sa-token-dao-redis-jackson/pom.xml b/sa-token-dao-redis-jackson/pom.xml
index ae81d1f4..ff95a103 100644
--- 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.17.0</version>
+        <version>1.18.0</version>
     </parent>
     <packaging>jar</packaging>
 
diff --git a/sa-token-dao-redis/pom.xml b/sa-token-dao-redis/pom.xml
index b00f868e..28da9c4a 100644
--- 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.17.0</version>
+        <version>1.18.0</version>
     </parent>
     <packaging>jar</packaging>
 
diff --git a/sa-token-demo-jwt/pom.xml b/sa-token-demo-jwt/pom.xml
index 9b889451..208af28a 100644
--- a/sa-token-demo-jwt/pom.xml
+++ b/sa-token-demo-jwt/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义sa-token版本号 -->
 	<properties>
-		<sa-token-version>1.17.0</sa-token-version>
+		<sa-token-version>1.18.0</sa-token-version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-demo-springboot/pom.xml b/sa-token-demo-springboot/pom.xml
index 5008328f..80b377d2 100644
--- a/sa-token-demo-springboot/pom.xml
+++ b/sa-token-demo-springboot/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义sa-token版本号 -->
 	<properties>
-		<sa-token-version>1.17.0</sa-token-version>
+		<sa-token-version>1.18.0</sa-token-version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-demo-webflux/pom.xml b/sa-token-demo-webflux/pom.xml
index ae9ef565..b1a1c271 100644
--- a/sa-token-demo-webflux/pom.xml
+++ b/sa-token-demo-webflux/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义sa-token版本号 -->
 	<properties>
-		<sa-token-version>1.17.0</sa-token-version>
+		<sa-token-version>1.18.0</sa-token-version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-doc/doc/README.md b/sa-token-doc/doc/README.md
index 80f4bb24..244158f6 100644
--- 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.17.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.18.0</h1>
 <h4 align="center">这可能是史上功能最全的 Java 权限认证框架！</h4>
 <h4 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
index 758a7840..df23d3a9 100644
--- a/sa-token-doc/doc/index.html
+++ b/sa-token-doc/doc/index.html
@@ -21,6 +21,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.17.0/doc/index.html">v1.17.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.16.0/doc/index.html">v1.16.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.15.0/doc/index.html">v1.15.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.14.0/doc/index.html">v1.14.0</option>
@@ -47,7 +48,7 @@
 		</div>
 		<script>
 			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>v1.17.0</sub>'
+			name += '<b style="font-size: 28px; vertical-align: middle;">Sa-Token</b> <sub>v1.18.0</sub>'
 			window.$docsify = {
 				name: name, // 名字 
 				repo: 'https://github.com/dromara/sa-token', // github地址 
diff --git a/sa-token-doc/doc/more/tj-gzh.md b/sa-token-doc/doc/more/tj-gzh.md
index 0b63f592..454f33d6 100644
--- a/sa-token-doc/doc/more/tj-gzh.md
+++ b/sa-token-doc/doc/more/tj-gzh.md
@@ -7,6 +7,11 @@
 
 <table class="gzh-table" style="text-align: center;">
     <tr>
+        <td>
+			<img src="https://mp.weixin.qq.com/mp/qrcode?scene=10000005&size=102&__biz=MzIxNjA5MTM2MA==&mid=2652444329&idx=1&sn=2a040e87f49a977a116c90e1107a9fdc&send_time="/>
+			<b>Java编程</b>
+			<span>专注Java技术分享，Java基础知识/数据结构/算法</span>
+		</td>
         <td>
 			<img src="https://mp.weixin.qq.com/mp/qrcode?scene=10000005&size=102&__biz=MzA4MDMyODg4OQ==&mid=2649482871&idx=2&sn=b376585faaf814d9072af539efda68fe&send_time="/>
 			<b>大侠学JAVA</b>
@@ -23,7 +28,6 @@
 			<span>有一个在程序员圈混了10年的老程序员, 分享程序员相关的精选内容教程</span>
 		</td>
 		<td></td>
-		<td></td>
     </tr>
     <tr>
         <td>
diff --git a/sa-token-doc/doc/more/update-log.md b/sa-token-doc/doc/more/update-log.md
index ff149f6e..609d4e8e 100644
--- a/sa-token-doc/doc/more/update-log.md
+++ b/sa-token-doc/doc/more/update-log.md
@@ -1,5 +1,17 @@
 # 更新日志 
 
+### 2021-4-24 @v1.18.0
+- 新增：新增权限通配符功能，灵活设置权限  **[重要]** 
+- 修复：修复自动续签处的逻辑错误 
+- 新增：新增Web开发常见漏洞防护建议 
+- 修复：修复`SaRequest`中缺少`getMethod()`的bug 
+- 修复：修复自动续签时的逻辑错误，感谢群成员`@N`的建议 
+- 新增：全局过滤器新增 `beforAuth` 前置函数 
+- 修复：修复在带有上下文的项目中无法正确获取请求路径的bug，感谢群成员`@dlwlrma`提供的建议
+- 新增：新增`SaHolder`上下文持有类，可方便的在上下文中读写数据 
+- 重构：`SaTokenManager` -> `SaManager` 
+- 重构：`SaTokenInsideUtil` -> `SaFoxUtil` 
+
 
 ### 2021-4-17 @v1.17.0
 - 修复：在WebFlux环境中引入Redis集成包无法启动的问题 
diff --git a/sa-token-doc/doc/start/download.md b/sa-token-doc/doc/start/download.md
index 8308bb2a..f5f2c07c 100644
--- a/sa-token-doc/doc/start/download.md
+++ b/sa-token-doc/doc/start/download.md
@@ -12,7 +12,7 @@
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-spring-boot-starter</artifactId>
-	<version>1.17.0</version>
+	<version>1.18.0</version>
 </dependency>
 ```
 
@@ -23,7 +23,7 @@
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-reactor-spring-boot-starter</artifactId>
-	<version>1.17.0</version>
+	<version>1.18.0</version>
 </dependency>
 ```
 
@@ -34,7 +34,7 @@
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-servlet</artifactId>
-	<version>1.17.0</version>
+	<version>1.18.0</version>
 </dependency>
 ```
 
@@ -45,7 +45,7 @@
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-core</artifactId>
-	<version>1.17.0</version>
+	<version>1.18.0</version>
 </dependency>
 ```
 <!---------------------------- tabs:end ------------------------------>
@@ -56,19 +56,19 @@
 <!-- tabs:start -->
 <!-- tab:SpringMVC环境 （ServletAPI）  -->
 ``` xml
-implementation 'cn.dev33:sa-token-spring-boot-starter:1.17.0'
+implementation 'cn.dev33:sa-token-spring-boot-starter:1.18.0'
 ```
 <!-- tab:WebFlux环境 （Reactor）  -->
 ``` xml
-implementation 'cn.dev33:sa-token-reactor-spring-boot-starter:1.17.0'
+implementation 'cn.dev33:sa-token-reactor-spring-boot-starter:1.18.0'
 ```
 <!-- tab:Servlet容器环境  -->
 ``` xml
-implementation 'cn.dev33:sa-token-servlet:1.17.0'
+implementation 'cn.dev33:sa-token-servlet:1.18.0'
 ```
 <!-- tab:其它  -->
 ``` xml
-implementation 'cn.dev33:sa-token-core:1.17.0'
+implementation 'cn.dev33:sa-token-core:1.18.0'
 ```
 <!-- tabs:end -->
 
diff --git a/sa-token-doc/doc/start/example.md b/sa-token-doc/doc/start/example.md
index cc4d8a13..f8363d66 100644
--- a/sa-token-doc/doc/start/example.md
+++ b/sa-token-doc/doc/start/example.md
@@ -17,7 +17,7 @@
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-spring-boot-starter</artifactId>
-	<version>1.17.0</version>
+	<version>1.18.0</version>
 </dependency>
 ```
 
diff --git a/sa-token-doc/doc/start/webflux-example.md b/sa-token-doc/doc/start/webflux-example.md
index c050e535..148975ef 100644
--- a/sa-token-doc/doc/start/webflux-example.md
+++ b/sa-token-doc/doc/start/webflux-example.md
@@ -19,7 +19,7 @@ WebFlux基于Reactor响应式模型开发，有着与标准ServletAPI完全不
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-reactor-spring-boot-starter</artifactId>
-	<version>1.17.0</version>
+	<version>1.18.0</version>
 </dependency>
 ```
 
diff --git a/sa-token-doc/doc/use/at-check.md b/sa-token-doc/doc/use/at-check.md
index 4ac0d8e0..57d0e55f 100644
--- 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.17.0</version>
+	<version>1.18.0</version>
 </dependency>
 ```
 
diff --git a/sa-token-doc/doc/use/dao-extend.md b/sa-token-doc/doc/use/dao-extend.md
index 438ebb15..849bd1b8 100644
--- a/sa-token-doc/doc/use/dao-extend.md
+++ b/sa-token-doc/doc/use/dao-extend.md
@@ -14,7 +14,7 @@ Sa-token默认将会话数据保存在内存中，此模式读写速度最快，
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-dao-redis</artifactId>
-	<version>1.17.0</version>
+	<version>1.18.0</version>
 </dependency>
 ```
 优点：兼容性好，缺点：Session序列化后基本不可读，对开发者来讲等同于乱码
@@ -26,7 +26,7 @@ Sa-token默认将会话数据保存在内存中，此模式读写速度最快，
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-dao-redis-jackson</artifactId>
-	<version>1.17.0</version>
+	<version>1.18.0</version>
 </dependency>
 ```
 优点：Session序列化后可读性强，可灵活手动修改，缺点：兼容性稍差
diff --git a/sa-token-doc/index.html b/sa-token-doc/index.html
index 69eddba3..ad99dd72 100644
--- 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.17.0</small></h1>
+					<h1>Sa-Token<small>v1.18.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-oauth2/pom.xml b/sa-token-oauth2/pom.xml
index b94c510f..0da868c4 100644
--- a/sa-token-oauth2/pom.xml
+++ b/sa-token-oauth2/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-parent</artifactId>
-        <version>1.17.0</version>
+        <version>1.18.0</version>
     </parent>
     <packaging>jar</packaging>
 
diff --git a/sa-token-reactor-spring-boot-starter/pom.xml b/sa-token-reactor-spring-boot-starter/pom.xml
index 4732d8c4..da61102b 100644
--- a/sa-token-reactor-spring-boot-starter/pom.xml
+++ b/sa-token-reactor-spring-boot-starter/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-parent</artifactId>
-        <version>1.17.0</version>
+        <version>1.18.0</version>
     </parent>
     <packaging>jar</packaging>
 
diff --git a/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index 5a373b84..86a8f98b 100644
--- a/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -136,7 +136,7 @@ public class SaReactorFilter implements WebFilter {
 
 	/**
 	 * 写入[前置函数]：在每次[认证函数]之前执行
-	 * @param auth see note 
+	 * @param beforeAuth see note 
 	 * @return 对象自身
 	 */
 	public SaReactorFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth) {
diff --git a/sa-token-servlet/pom.xml b/sa-token-servlet/pom.xml
index 9039bcaa..51e6fb9d 100644
--- a/sa-token-servlet/pom.xml
+++ b/sa-token-servlet/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
         <groupId>cn.dev33</groupId>
         <artifactId>sa-token-parent</artifactId>
-        <version>1.17.0</version>
+        <version>1.18.0</version>
     </parent>
     <packaging>jar</packaging>
 
diff --git a/sa-token-spring-aop/pom.xml b/sa-token-spring-aop/pom.xml
index b67aa725..3178f030 100644
--- 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.17.0</version>
+        <version>1.18.0</version>
     </parent>
     <packaging>jar</packaging>
 
diff --git a/sa-token-spring-boot-starter/pom.xml b/sa-token-spring-boot-starter/pom.xml
index 2197138f..6c2c835d 100644
--- 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.17.0</version>
+        <version>1.18.0</version>
     </parent>
     <packaging>jar</packaging>
 
diff --git a/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 1bbb11a2..c5ac4f38 100644
--- a/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -136,7 +136,7 @@ public class SaServletFilter implements Filter {
 
 	/**
 	 * 写入[前置函数]：在每次[认证函数]之前执行
-	 * @param auth see note 
+	 * @param beforeAuth see note 
 	 * @return 对象自身
 	 */
 	public SaServletFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth) {