From 600cc98e203ebba78ed31c89ed20183b8a1b8aaa Mon Sep 17 00:00:00 2001
From: shengzhang <2393584716@qq.com>
Date: Sun, 10 Jan 2021 00:15:23 +0800
Subject: [PATCH] =?UTF-8?q?v1.11.0=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  4 +-
 pom.xml                                       |  2 +-
 sa-token-core/pom.xml                         |  2 +-
 .../cn/dev33/satoken/util/SaTokenConsts.java  |  2 +-
 sa-token-dao-redis-jackson/pom.xml            |  4 +-
 sa-token-dao-redis/pom.xml                    |  4 +-
 sa-token-demo-springboot/pom.xml              | 10 ++--
 .../main/java/com/pj/test/TestService.java    |  1 -
 sa-token-doc/doc/README.md                    |  4 +-
 sa-token-doc/doc/index.html                   |  3 +-
 sa-token-doc/doc/more/update-log.md           |  5 ++
 sa-token-doc/doc/start/download.md            |  2 +-
 sa-token-doc/doc/start/example.md             |  2 +-
 sa-token-doc/doc/use/at-check.md              | 48 +++++++++++++++++--
 sa-token-doc/doc/use/dao-extend.md            |  4 +-
 sa-token-doc/doc/use/search-session.md        |  6 ++-
 sa-token-doc/index.html                       |  2 +-
 sa-token-spring-aop/pom.xml                   |  4 +-
 .../cn/dev33/satoken/aop/SaCheckAspect.java   |  4 +-
 sa-token-spring-boot-starter/pom.xml          |  4 +-
 20 files changed, 84 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index f01bdf52..ee483f7a 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 <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" style="margin-bottom: 10px;">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.10.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.11.0</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.10.0-2B9939"></a>
+	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.11.0-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>
diff --git a/pom.xml b/pom.xml
index 6bd430a3..0bca6349 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.10.0</version>
+	<version>1.11.0</version>
 	
 	<!-- 项目介绍 -->
 	<name>sa-token</name>
diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml
index ffc52764..594da863 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.10.0</version>
+        <version>1.11.0</version>
     </parent>
     <packaging>jar</packaging>
 
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 dd8dff47..0d85cec2 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
@@ -10,7 +10,7 @@ public class SaTokenConsts {
 	/**
 	 * sa-token 版本号 
 	 */
-	public static final String VERSION_NO = "v1.10.0";
+	public static final String VERSION_NO = "v1.11.0";
 
 	/**
 	 * sa-token 开源地址 
diff --git a/sa-token-dao-redis-jackson/pom.xml b/sa-token-dao-redis-jackson/pom.xml
index 6fdfecd5..7e09a657 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.10.0</version>
+        <version>1.11.0</version>
     </parent>
     <packaging>jar</packaging>
 
@@ -20,7 +20,7 @@
 		<dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency>
 		<!-- RedisTemplate 相关操作API -->
         <dependency>
diff --git a/sa-token-dao-redis/pom.xml b/sa-token-dao-redis/pom.xml
index 0cddcdcd..edd7b7ba 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.10.0</version>
+        <version>1.11.0</version>
     </parent>
     <packaging>jar</packaging>
 
@@ -20,7 +20,7 @@
 		<dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency>
 		<!-- RedisTemplate 相关操作API -->
         <dependency>
diff --git a/sa-token-demo-springboot/pom.xml b/sa-token-demo-springboot/pom.xml
index 23c8d1ff..13a099c6 100644
--- 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.10.0</version>
+            <version>1.11.0</version>
         </dependency>
 		
 		<!-- sa-token整合redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-dao-redis</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency> -->
 		
 		<!-- sa-token整合redis (使用jackson序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-dao-redis-jackson</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency> -->
         
 		<!-- 提供redis连接池 -->
@@ -52,11 +52,11 @@
             <artifactId>commons-pool2</artifactId>
         </dependency> -->
         
-		<!-- sa-token整合SpringAop实现注解鉴权 -->
+		<!-- sa-token整合SpringAOP实现注解鉴权 -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-aop</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency> -->
 
 		<!-- @ConfigurationProperties -->
diff --git a/sa-token-demo-springboot/src/main/java/com/pj/test/TestService.java b/sa-token-demo-springboot/src/main/java/com/pj/test/TestService.java
index 3410ddc6..0ef61e62 100644
--- a/sa-token-demo-springboot/src/main/java/com/pj/test/TestService.java
+++ b/sa-token-demo-springboot/src/main/java/com/pj/test/TestService.java
@@ -14,7 +14,6 @@ import cn.dev33.satoken.annotation.SaCheckLogin;
  *
  */
 @Service
-//@SaCheckLogin
 public class TestService {
 
 	@SaCheckLogin
diff --git a/sa-token-doc/doc/README.md b/sa-token-doc/doc/README.md
index f01bdf52..ee483f7a 100644
--- a/sa-token-doc/doc/README.md
+++ b/sa-token-doc/doc/README.md
@@ -1,11 +1,11 @@
 <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" style="margin-bottom: 10px;">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.10.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.11.0</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.10.0-2B9939"></a>
+	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.11.0-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>
diff --git a/sa-token-doc/doc/index.html b/sa-token-doc/doc/index.html
index 786d5d16..b6dfccfa 100644
--- 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.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>
 				<option value="http://sa-token.dev33.cn/v/v1.8.0/doc/index.html">v1.8.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.7.0/doc/index.html">v1.7.0</option>
@@ -39,7 +40,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.10.0</sub>'
+			name += '<b style="font-size: 24px; vertical-align: middle;">sa-token</b> <sub>v1.11.0</sub>'
 			window.$docsify = {
 				name: name, // 名字 
 				repo: 'https://github.com/click33/sa-token', // github地址 
diff --git a/sa-token-doc/doc/more/update-log.md b/sa-token-doc/doc/more/update-log.md
index 37f05553..26b95b52 100644
--- a/sa-token-doc/doc/more/update-log.md
+++ b/sa-token-doc/doc/more/update-log.md
@@ -1,6 +1,11 @@
 # 更新日志 
 
 
+### 2021-1-9 @v1.11.0
+- 新增：提供AOP注解鉴权方案 **[重要]**
+- 优化自动生成token的算法
+
+
 ### 2021-1-9 @v1.10.0
 - 新增：提供查询所有会话方案  **[重要]**
 - 修复：修复token设置为永不过期时无法正常被顶下线的bug，感谢github用户 @zjh599245299 提出的bug
diff --git a/sa-token-doc/doc/start/download.md b/sa-token-doc/doc/start/download.md
index 93e7e5ed..6bb9f288 100644
--- a/sa-token-doc/doc/start/download.md
+++ b/sa-token-doc/doc/start/download.md
@@ -9,7 +9,7 @@
 <dependency>
 	<groupId>cn.dev33</groupId>
 	<artifactId>sa-token-spring-boot-starter</artifactId>
-	<version>1.10.0</version>
+	<version>1.11.0</version>
 </dependency>
 ```
 
diff --git a/sa-token-doc/doc/start/example.md b/sa-token-doc/doc/start/example.md
index 7cc14a09..a4920fa5 100644
--- 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.10.0</version>
+	<version>1.11.0</version>
 </dependency>
 ```
 
diff --git a/sa-token-doc/doc/use/at-check.md b/sa-token-doc/doc/use/at-check.md
index 8034e98b..3f7cf06a 100644
--- a/sa-token-doc/doc/use/at-check.md
+++ b/sa-token-doc/doc/use/at-check.md
@@ -73,9 +73,51 @@
 ```
 
 
-- mode有两种取值：
-	- `SaMode.AND`, 标注一组权限，会话必须全部具有才可通过校验
-	- `SaMode.OR`, 标注一组权限，会话只要具有其一即可通过校验
+mode有两种取值：
+- `SaMode.AND`, 标注一组权限，会话必须全部具有才可通过校验
+- `SaMode.OR`, 标注一组权限，会话只要具有其一即可通过校验
+
+
+
+
+## 4、AOP模式使用注解
+
+使用拦截器方式，只能把注解加到`Controller层`上，那么如果我想把注解写到项目的任意位置，比如`Service层`，应该怎么办？ <br>
+很简单，你只需要将拦截器模式更换为`SpringAOP模式`即可, 在`pom.xml`里添加
+
+``` xml 
+<!-- sa-token整合SpringAOP实现注解鉴权 -->
+<dependency>
+	<groupId>cn.dev33</groupId>
+	<artifactId>sa-token-spring-aop</artifactId>
+	<version>1.11.0</version>
+</dependency>
+```
+
+然后你就可以在任意地方使用注解鉴权，例如:
+``` java
+@Service
+public class UserService {
+	@SaCheckLogin
+	public List<String> getList() {
+		System.out.println("getList");
+		return new ArrayList<String>();
+	}
+}
+```
+
+
+**注意：拦截器模式和AOP模式不可同时集成，否则会在Controller层发生一个注解校验两次的bug**
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/sa-token-doc/doc/use/dao-extend.md b/sa-token-doc/doc/use/dao-extend.md
index e96ba14a..ae3f1e6f 100644
--- 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.10.0</version>
+		<version>1.11.0</version>
 	</dependency>
 ```
 优点：兼容性好，缺点：session序列化后基本不可读，对开发者来讲等同于乱码
@@ -23,7 +23,7 @@
 	<dependency>
 		<groupId>cn.dev33</groupId>
 		<artifactId>sa-token-dao-redis-jackson</artifactId>
-		<version>1.10.0</version>
+		<version>1.11.0</version>
 	</dependency>
 ```
 优点：session序列化后可读性强，可灵活手动修改，缺点：兼容性稍差
diff --git a/sa-token-doc/doc/use/search-session.md b/sa-token-doc/doc/use/search-session.md
index f5412d06..9a9aa8d2 100644
--- a/sa-token-doc/doc/use/search-session.md
+++ b/sa-token-doc/doc/use/search-session.md
@@ -32,7 +32,11 @@ StpUtil.searchTokenSessionId(String keyword, int start, int size);
 
 使用示例：
 ``` java
-StpUtil.searchTokenValue("1000", 0, 10);	// 查询value包括1000的所有token，结果集从第0条开始，返回10条
+// 查询value包括1000的所有token，结果集从第0条开始，返回10条
+List<String> tokenList = StpUtil.searchTokenValue("1000", 0, 10);	
+for (String token : tokenList) {
+	System.out.println(token);
+}
 ```
 
 
diff --git a/sa-token-doc/index.html b/sa-token-doc/index.html
index a743a06a..177539d5 100644
--- 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.10.0</small></h1>
+					<h1>sa-token<small>v1.11.0</small></h1>
 					<div class="sub-title">一个JavaWeb轻量级权限认证框架，功能全面，上手简单</div>
 					<!-- <p>0配置开箱即用，低学习成本</p> -->
 					<p>登录验证、权限验证、Session会话、踢人下线、集成Redis、前后台分离、模拟他人账号、多账号体系、注解式鉴权、花式token、自动续签、同端互斥登录、会话治理、Spring集成...</p>
diff --git a/sa-token-spring-aop/pom.xml b/sa-token-spring-aop/pom.xml
index 63a4de30..a51fd21e 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.10.0</version>
+        <version>1.11.0</version>
     </parent>
     <packaging>jar</packaging>
 
@@ -20,7 +20,7 @@
 		<dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency>
 		<!-- spring-boot-starter-aop -->
 		<dependency>
diff --git a/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java b/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
index f2c35f2c..c68894e1 100644
--- a/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
+++ b/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
@@ -31,7 +31,7 @@ public class SaCheckAspect {
 	}
 
 	/**
-	 * 定义AOP签名 --> (切入所有使用sa-token鉴权注解的方法) 
+	 * 定义AOP签名 (切入所有使用sa-token鉴权注解的方法) 
 	 */
 	public static final String POINTCUT_SIGN = "@within(cn.dev33.satoken.annotation.SaCheckLogin) || @annotation(cn.dev33.satoken.annotation.SaCheckLogin) || "
 			+ "@within(cn.dev33.satoken.annotation.SaCheckRole) || @annotation(cn.dev33.satoken.annotation.SaCheckRole) || "
@@ -48,7 +48,7 @@ public class SaCheckAspect {
 	 * 环绕切入 
 	 * @param joinPoint 切面对象
 	 * @return 底层方法执行后的返回值
-	 * @throws Throwable
+	 * @throws Throwable 底层方法抛出的异常 
 	 */
 	@Around("pointcut()")
 	public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
diff --git a/sa-token-spring-boot-starter/pom.xml b/sa-token-spring-boot-starter/pom.xml
index 16859ed5..c7e53af0 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.10.0</version>
+        <version>1.11.0</version>
     </parent>
     <packaging>jar</packaging>
 
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>cn.dev33</groupId>
 			<artifactId>sa-token-core</artifactId>
-			<version>1.10.0</version>
+			<version>1.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>