From 69d01e3e6eebb5ebdc41ed712244d20c1a432ca8 Mon Sep 17 00:00:00 2001
From: shengzhang <2393584716@qq.com>
Date: Tue, 5 Jan 2021 18:04:14 +0800
Subject: [PATCH] =?UTF-8?q?v1.9.0=20=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                  | 7 +++++--
 pom.xml                                                    | 2 +-
 sa-token-core/pom.xml                                      | 2 +-
 .../src/main/java/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                           | 6 +++---
 sa-token-doc/doc/README.md                                 | 7 +++++--
 sa-token-doc/doc/index.html                                | 5 +++--
 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/dao-extend.md                         | 4 ++--
 sa-token-doc/index.html                                    | 6 +++---
 sa-token-spring-boot-starter/pom.xml                       | 4 ++--
 15 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 3f90f84a..3e5e92db 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.8.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.9.0</h1>
 <h4 align="center">一个JavaWeb轻量级权限认证框架，功能全面，上手简单</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.8.0-2B9939"></a>
+	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.9.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>
@@ -60,6 +60,8 @@ StpUtil.hasPermission("user:add");  // 查询当前账号是否含有指定权
 StpUtil.getSession();               // 获取当前账号id的Session 
 StpUtil.getSessionByLoginId(10001); // 获取账号id为10001的Session
 StpUtil.getTokenValueByLoginId(10001);  // 获取账号id为10001的token令牌值
+StpUtil.setLoginId(10001, "PC");        // 指定设备标识登录
+StpUtil.logoutByLoginId(10001, "PC");   // 指定设备标识进行强制注销 (不同端不受影响)
 ```
 sa-token的API众多，请恕此处无法为您逐一展示，更多示例请戳官方在线文档
 
@@ -78,6 +80,7 @@ sa-token的API众多，请恕此处无法为您逐一展示，更多示例请戳
 - **注解式鉴权** —— 优雅的将鉴权与业务代码分离
 - **花式token生成** —— 内置六种token风格，还可自定义token生成策略
 - **自动续签** —— 提供两种token过期策略，灵活搭配使用，还可自动续签
+- **同端互斥登录** —— 像QQ一样手机电脑同时在线，但是两个手机上互斥登录
 - **组件自动注入** —— 零配置与Spring等框架集成
 - **更多功能正在集成中...** —— 如有您有好想法或者建议，欢迎加群交流
 
diff --git a/pom.xml b/pom.xml
index d2a16569..1e595910 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.8.0</version>
+	<version>1.9.0</version>
 	
 	<!-- 项目介绍 -->
 	<name>sa-token</name>
diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml
index 3baf598e..ad96cd6f 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.8.0</version>
+        <version>1.9.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 10e8decd..a5704f65 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.8.0";
+	public static final String VERSION_NO = "v1.9.0";
 
 	/**
 	 * sa-token 开源地址 
diff --git a/sa-token-dao-redis-jackson/pom.xml b/sa-token-dao-redis-jackson/pom.xml
index e965e5ba..5adde229 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.8.0</version>
+        <version>1.9.0</version>
     </parent>
     <packaging>jar</packaging>
 
@@ -20,7 +20,7 @@
 		<dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.8.0</version>
+            <version>1.9.0</version>
         </dependency>
 		<!-- RedisTemplate 相关操作API -->
         <dependency>
diff --git a/sa-token-dao-redis/pom.xml b/sa-token-dao-redis/pom.xml
index cc8cdbee..9d5f072b 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.8.0</version>
+        <version>1.9.0</version>
     </parent>
     <packaging>jar</packaging>
 
@@ -20,7 +20,7 @@
 		<dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.8.0</version>
+            <version>1.9.0</version>
         </dependency>
 		<!-- RedisTemplate 相关操作API -->
         <dependency>
diff --git a/sa-token-demo-springboot/pom.xml b/sa-token-demo-springboot/pom.xml
index bc599554..09bb81d1 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.8.0</version>
+            <version>1.9.0</version>
         </dependency>
 		
 		<!-- sa-token整合redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-dao-redis</artifactId>
-            <version>1.8.0</version>
+            <version>1.9.0</version>
         </dependency> -->
 		
 		<!-- sa-token整合redis (使用jackson序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-dao-redis-jackson</artifactId>
-            <version>1.8.0</version>
+            <version>1.9.0</version>
         </dependency> -->
         
 		<!-- 提供redis连接池 -->
diff --git a/sa-token-doc/doc/README.md b/sa-token-doc/doc/README.md
index 3f90f84a..3e5e92db 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.8.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.9.0</h1>
 <h4 align="center">一个JavaWeb轻量级权限认证框架，功能全面，上手简单</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.8.0-2B9939"></a>
+	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.9.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>
@@ -60,6 +60,8 @@ StpUtil.hasPermission("user:add");  // 查询当前账号是否含有指定权
 StpUtil.getSession();               // 获取当前账号id的Session 
 StpUtil.getSessionByLoginId(10001); // 获取账号id为10001的Session
 StpUtil.getTokenValueByLoginId(10001);  // 获取账号id为10001的token令牌值
+StpUtil.setLoginId(10001, "PC");        // 指定设备标识登录
+StpUtil.logoutByLoginId(10001, "PC");   // 指定设备标识进行强制注销 (不同端不受影响)
 ```
 sa-token的API众多，请恕此处无法为您逐一展示，更多示例请戳官方在线文档
 
@@ -78,6 +80,7 @@ sa-token的API众多，请恕此处无法为您逐一展示，更多示例请戳
 - **注解式鉴权** —— 优雅的将鉴权与业务代码分离
 - **花式token生成** —— 内置六种token风格，还可自定义token生成策略
 - **自动续签** —— 提供两种token过期策略，灵活搭配使用，还可自动续签
+- **同端互斥登录** —— 像QQ一样手机电脑同时在线，但是两个手机上互斥登录
 - **组件自动注入** —— 零配置与Spring等框架集成
 - **更多功能正在集成中...** —— 如有您有好想法或者建议，欢迎加群交流
 
diff --git a/sa-token-doc/doc/index.html b/sa-token-doc/doc/index.html
index 511f2746..28cc96ef 100644
--- a/sa-token-doc/doc/index.html
+++ b/sa-token-doc/doc/index.html
@@ -7,7 +7,7 @@
 		<meta name="description" content="Description">
 		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
 		<meta name="keywords" content="sa-token|sa-token框架|sa-token文档|sa-token在线文档|权限认证框架">
-		<meta name="description" content="sa-token是一个JavaWeb权限认证框架，功能全面，上手简单，登录验证、权限验证、Session会话、踢人下线、集成Redis、前后台分离、模拟他人账号、多账号体系、注解式鉴权、花式token、自动续签、Spring集成...，零配置开箱即用，覆盖所有应用场景，你所需要的功能，这里都有">
+		<meta name="description" content="sa-token是一个JavaWeb权限认证框架，功能全面，上手简单，登录验证、权限验证、Session会话、踢人下线、集成Redis、前后台分离、模拟他人账号、多账号体系、注解式鉴权、花式token、自动续签、同端互斥登录、Spring集成...，零配置开箱即用，覆盖所有应用场景，你所需要的功能，这里都有">
 		<link rel="stylesheet" href="https://unpkg.com/docsify@4.11.3/lib/themes/vue.css">
 		<link rel="stylesheet" href="./lib/index.css">
 		<link rel="shortcut icon" type="image/x-icon" href="logo.png">
@@ -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.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>
 				<option value="http://sa-token.dev33.cn/v/v1.6.0/doc/index.html">v1.6.0</option>
 				<option value="http://sa-token.dev33.cn/v/v1.5.1/doc/index.html">v1.5.1</option>
@@ -37,7 +38,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.8.0</sub>'
+			name += '<b style="font-size: 24px; vertical-align: middle;">sa-token</b> <sub>v1.9.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 57124142..cc790b3b 100644
--- a/sa-token-doc/doc/more/update-log.md
+++ b/sa-token-doc/doc/more/update-log.md
@@ -1,5 +1,10 @@
 # 更新日志 
 
+### 2021-1-2 @v1.9.0
+- 优化：`spring-boot-starter-data-redis` 由 `2.3.7.RELEASE` 改为 `2.3.3.RELEASE` 
+- 修复：补上注解拦截器里漏掉验证@SaCheckRole的bug
+- 新增：新增同端互斥登录，像QQ一样手机电脑同时在线，但是两个手机上互斥登录
+
 
 ### 2021-1-2 @v1.8.0
 - 优化：优化源码注释
diff --git a/sa-token-doc/doc/start/download.md b/sa-token-doc/doc/start/download.md
index 4c185002..056f2bb5 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.8.0</version>
+	<version>1.9.0</version>
 </dependency>
 ```
 
diff --git a/sa-token-doc/doc/start/example.md b/sa-token-doc/doc/start/example.md
index 19f76f5e..7e1fe812 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.8.0</version>
+	<version>1.9.0</version>
 </dependency>
 ```
 
diff --git a/sa-token-doc/doc/use/dao-extend.md b/sa-token-doc/doc/use/dao-extend.md
index a3b81098..8830418c 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.8.0</version>
+		<version>1.9.0</version>
 	</dependency>
 ```
 优点：兼容性好，缺点：session序列化后基本不可读，对开发者来讲等同于乱码
@@ -23,7 +23,7 @@
 	<dependency>
 		<groupId>cn.dev33</groupId>
 		<artifactId>sa-token-dao-redis-jackson</artifactId>
-		<version>1.8.0</version>
+		<version>1.9.0</version>
 	</dependency>
 ```
 优点：session序列化后可读性强，可灵活手动修改，缺点：兼容性稍差
diff --git a/sa-token-doc/index.html b/sa-token-doc/index.html
index 0628596f..5f0e067a 100644
--- a/sa-token-doc/index.html
+++ b/sa-token-doc/index.html
@@ -7,7 +7,7 @@
 		<meta name="description" content="Description">
 		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
 		<meta name="keywords" content="sa-token|sa-token框架|sa-token文档|sa-token在线文档|权限认证框架">
-		<meta name="description" content="sa-token是一个JavaWeb权限认证框架，功能全面，上手简单，登录验证、权限验证、Session会话、踢人下线、集成Redis、前后台分离、模拟他人账号、多账号体系、注解式鉴权、花式token、自动续签、Spring集成...，零配置开箱即用，覆盖所有应用场景，你所需要的功能，这里都有">
+		<meta name="description" content="sa-token是一个JavaWeb权限认证框架，功能全面，上手简单，登录验证、权限验证、Session会话、踢人下线、集成Redis、前后台分离、模拟他人账号、多账号体系、注解式鉴权、花式token、自动续签、同端互斥登录、Spring集成...，零配置开箱即用，覆盖所有应用场景，你所需要的功能，这里都有">
 		<link rel="stylesheet" href="https://unpkg.com/docsify@4.11.3/lib/themes/vue.css">
 		<link rel="shortcut icon" type="image/x-icon" href="doc/logo.png">
 		<link rel="stylesheet" href="index.css">
@@ -43,10 +43,10 @@
 			<!-- 内容部分 -->
 			<div class="main-box">
 				<div class="content-box">
-					<h1>sa-token<small>v1.8.0</small></h1>
+					<h1>sa-token<small>v1.9.0</small></h1>
 					<div class="sub-title">一个JavaWeb轻量级权限认证框架，功能全面，上手简单</div>
 					<!-- <p>0配置开箱即用，低学习成本</p> -->
-					<p>登录验证、权限验证、Session会话、踢人下线、集成Redis、前后台分离、模拟他人账号、多账号体系、注解式鉴权、花式token、自动续签、Spring集成...</p>
+					<p>登录验证、权限验证、Session会话、踢人下线、集成Redis、前后台分离、模拟他人账号、多账号体系、注解式鉴权、花式token、自动续签、同端互斥登录、Spring集成...</p>
 					<p>零配置开箱即用，覆盖所有应用场景，你所需要的功能，这里都有</p>
 					<div class="btn-box">
 						<a href="https://github.com/click33/sa-token" target="_blank">GitHub</a>
diff --git a/sa-token-spring-boot-starter/pom.xml b/sa-token-spring-boot-starter/pom.xml
index 7f820631..42606501 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.8.0</version>
+        <version>1.9.0</version>
     </parent>
     <packaging>jar</packaging>
 
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>cn.dev33</groupId>
 			<artifactId>sa-token-core</artifactId>
-			<version>1.8.0</version>
+			<version>1.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>