⚡ 完善示例

⚡ 完善v1.7.0文档
⚡ v1.7.0 版本更新
2026-05-22 22:53:16 +00:00 · 2020-12-25 00:21:02 +08:00 · 2020-12-25 00:16:12 +08:00 · 2020-12-24 22:51:57 +08:00 · 2020-12-24 18:11:12 +08:00 · 2020-12-23 18:49:22 +08:00
66 changed files with 2253 additions and 1056 deletions
@@ -1,21 +1,201 @@
-MIT License
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/

-Copyright (c) 2020 www.uviewui.com
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+   1. Definitions.

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2011-2019 hubin.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
@@ -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.6.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.7.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.6.0-2B9939"></a>
+	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.7.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>
@@ -0,0 +1,87 @@
+<?xml version='1.0' encoding='utf-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<!-- 基础信息 -->
+    <groupId>cn.dev33</groupId>
+    <artifactId>sa-token-parent</artifactId>
+	<packaging>pom</packaging>
+	<version>1.7.0</version>
+	
+	<!-- 项目介绍 -->
+	<name>sa-token</name>
+	<description>A Java Web lightweight authority authentication framework, comprehensive function, easy to use</description>
+	<url>https://github.com/click33/sa-token</url>
+
+	
+	<!-- 所有模块 -->
+	<modules>
+		<module>sp-token-core</module>
+		<module>sa-token-spring-boot-starter</module>
+	</modules>
+	
+	<!-- 开源协议 apache 2.0 -->
+	<licenses>
+		<license>
+			<name>Apache 2</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+			<comments>A business-friendly OSS license</comments>
+		</license>
+	</licenses>
+	
+	<!-- 一些属性 -->
+	<properties>
+        <jdk.version>1.8</jdk.version>
+		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
+	</properties>
+
+	<!-- 仓库信息 -->
+	<scm>
+		<tag>master</tag>
+		<url>https://github.com/click33/sa-token.git</url>
+		<connection>scm:git:https://github.com/click33/sa-token.git</connection>
+		<developerConnection>scm:git:https://github.com/click33/sa-token.git</developerConnection>
+	</scm>
+	
+	<!-- 作者信息 -->
+	<developers>
+		<developer>
+			<name>shengzhang</name>
+			<email>2393584716@qq.com</email>
+		</developer>
+	</developers>
+	
+	
+	<!-- 父仓库 -->
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>7</version>
+	</parent>
+	
+	<!-- 仓库依赖 -->
+	<dependencies>
+		
+	</dependencies>
+	
+	<!-- 项目构建 -->
+	<build>
+	   <plugins>
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-compiler-plugin</artifactId>
+			<version>3.2</version>
+			<configuration>
+				<source>1.8</source>
+				<target>1.8</target>
+				<encoding>UTF-8</encoding>
+			</configuration>
+		</plugin>
+	   </plugins>
+	</build>
+	
+</project>
@@ -36,7 +36,7 @@
    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.0.0.RELEASE/spring-boot-starter-aop-2.0.0.RELEASE.jar" enabled="true" runInBatchMode="false"/>
    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-aop/5.0.4.RELEASE/spring-aop-5.0.4.RELEASE.jar" enabled="true" runInBatchMode="false"/>
    <factorypathentry kind="VARJAR" id="M2_REPO/org/aspectj/aspectjweaver/1.8.13/aspectjweaver-1.8.13.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/cn/dev33/sa-token/1.6.0/sa-token-1.6.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar" enabled="true" runInBatchMode="false"/>
    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-redis/1.4.7.RELEASE/spring-boot-starter-redis-1.4.7.RELEASE.jar" enabled="true" runInBatchMode="false"/>
    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-redis/2.0.5.RELEASE/spring-data-redis-2.0.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-keyvalue/2.0.5.RELEASE/spring-data-keyvalue-2.0.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
@@ -25,18 +25,11 @@
 			<artifactId>spring-boot-starter-aop</artifactId>
 		</dependency>
 		
-		<!-- 开发测试 -->
-		<!-- <dependency>
-            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dev</artifactId>
-            <version>1.6.0</version>
-        </dependency> -->
-		
 		<!-- sa-token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
 		<dependency>
            <groupId>cn.dev33</groupId>
-            <artifactId>sa-token</artifactId>
-            <version>1.6.0</version>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <version>1.7.0</version>
        </dependency>
 		
 		<!-- SpringBoot整合redis -->
@@ -4,16 +4,13 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

 import cn.dev33.satoken.SaTokenManager;
-import cn.dev33.satoken.spring.SaTokenSetup;

-@SaTokenSetup // 必须有这个注解，用来标注加载sa-token
@SpringBootApplication
 public class SaTokenDemoApplication {

 	public static void main(String[] args) {
 		SpringApplication.run(SaTokenDemoApplication.class, args); 
-		System.out.println("启动成功：sa-token配置如下：" + SaTokenManager.getConfig());
+		System.out.println("\n启动成功：sa-token配置如下：" + SaTokenManager.getConfig());
 	}
 	
-
 }
@@ -4,8 +4,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

-import cn.dev33.satoken.annotation.SaCheckInterceptor;
 import cn.dev33.satoken.config.SaTokenConfig;
+import cn.dev33.satoken.interceptor.SaCheckInterceptor;

 /**
 * sa-token代码方式进行配置
@@ -42,54 +42,77 @@ public class SaTokenDaoRedis implements SaTokenDao {
 	// 写入指定key-value键值对，并设定过期时间(单位：秒)
 	@Override
 	public void setValue(String key, String value, long timeout) {
-		stringRedisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
+		// 判断是否为永不过期 
+		if(timeout == SaTokenDao.NEVER_EXPIRE) {
+			stringRedisTemplate.opsForValue().set(key, value);
+		} else {
+			stringRedisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
+		}
 	}

 	// 更新指定key-value键值对 (过期时间取原来的值)
 	@Override
 	public void updateValue(String key, String value) {
-		long expire = redisTemplate.getExpire(key);
-		if(expire == -2) {	// -2 = 无此键 
+		long expire = getTimeout(key);
+		if(expire == SaTokenDao.NOT_VALUE_EXPIRE) {	// -2 = 无此键 
 			return;
 		}
-		stringRedisTemplate.opsForValue().set(key, value, expire, TimeUnit.SECONDS);
+		this.setValue(key, value, expire);
 	}
 	
 	// 删除一个指定的key 
 	@Override
-	public void delKey(String key) {
+	public void deleteKey(String key) {
 		stringRedisTemplate.delete(key);
 	}

+	// 获取指定key的剩余存活时间 (单位: 秒)
+	@Override
+	public long getTimeout(String key) {
+		return stringRedisTemplate.getExpire(key);
+	}
+	
+	
 	
 	// 根据指定key的session，如果没有，则返回空 
 	@Override
-	public SaSession getSaSession(String sessionId) {
+	public SaSession getSession(String sessionId) {
 		return redisTemplate.opsForValue().get(sessionId);
 	}

 	// 将指定session持久化 
 	@Override
-	public void saveSaSession(SaSession session, long timeout) {
-		redisTemplate.opsForValue().set(session.getId(), session, timeout, TimeUnit.SECONDS);
+	public void saveSession(SaSession session, long timeout) {
+		// 判断是否为永不过期 
+		if(timeout == SaTokenDao.NEVER_EXPIRE) {
+			redisTemplate.opsForValue().set(session.getId(), session);
+		} else {
+			redisTemplate.opsForValue().set(session.getId(), session, timeout, TimeUnit.SECONDS);
+		}
 	}

 	// 更新指定session 
 	@Override
-	public void updateSaSession(SaSession session) {
-		long expire = redisTemplate.getExpire(session.getId());
-		if(expire == -2) {	// -2 = 无此键 
+	public void updateSession(SaSession session) {
+		long expire = getSessionTimeout(session.getId());
+		if(expire == SaTokenDao.NOT_VALUE_EXPIRE) {	// -2 = 无此键 
 			return;
 		}
-		redisTemplate.opsForValue().set(session.getId(), session, expire, TimeUnit.SECONDS);
+		this.saveSession(session, expire);
 	}

 	// 删除一个指定的session 
 	@Override
-	public void deleteSaSession(String sessionId) {
+	public void deleteSession(String sessionId) {
 		redisTemplate.delete(sessionId);
 	}

+	// 获取指定SaSession的剩余存活时间 (单位: 秒)
+	@Override
+	public long getSessionTimeout(String sessionId) {
+		return redisTemplate.getExpire(sessionId);
+	}
+

 	

@@ -1,29 +1,19 @@
 package com.pj.satoken;

-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
-import cn.dev33.satoken.SaTokenManager;
 import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpLogic;

 /**
 * 一个默认的实现 
 * @author kong 
 */
-@Service
 public class StpUserUtil {

 	/**
 	 * 底层的 StpLogic 对象  
 	 */
-	public static StpLogic stpLogic = new StpLogic("user") {
-		@Override
-		public String getKeyTokenName() {
-	 		return SaTokenManager.getConfig().getTokenName() + "-user";
-	 	}
-	}; 
+	public static StpLogic stpLogic = new StpLogic("user"); 
 	
 	
 	// =================== 获取token 相关 ===================
@@ -45,19 +35,27 @@ public class StpUserUtil {
 	}

 	/** 
-	 * 获取指定id的tokenValue
+	 * 获取指定id的tokenValue 
 	 * @param loginId  .
 	 * @return
 	 */
 	public static String getTokenValueByLoginId(Object loginId) {
 		return stpLogic.getTokenValueByLoginId(loginId);
 	}
-
+	
 	/**
-	 * 获取当前会话的token信息：tokenName与tokenValue
-	 * @return 一个Map对象 
+	 * 获取当前StpLogin的loginKey 
+	 * @return 当前StpLogin的loginKey
 	 */
-	public static Map<String, String> getTokenInfo() {
+	public static String getLoginKey(){
+		return stpLogic.getLoginKey();
+	}
+	
+	/**
+	 * 获取当前会话的token信息 
+	 * @return token信息 
+	 */
+	public static SaTokenInfo getTokenInfo() {
 		return stpLogic.getTokenInfo();
 	}

@@ -79,13 +77,21 @@ public class StpUserUtil {
 	}

 	/**
-	 * 指定loginId的会话注销登录（踢人下线）
+	 * 指定loginId的会话注销登录（清退下线）
 	 * @param loginId 账号id 
 	 */
 	public static void logoutByLoginId(Object loginId) {
 		stpLogic.logoutByLoginId(loginId);
 	}

+	/**
+	 * 指定loginId的会话注销登录（踢人下线）
+	 * @param loginId 账号id 
+	 */
+	public static void kickoutByLoginId(Object loginId) {
+		stpLogic.kickoutByLoginId(loginId);
+	}
+	
 	// 查询相关

 	/** 
@@ -160,6 +166,7 @@ public class StpUserUtil {
 		return stpLogic.getLoginIdByToken(tokenValue);
 	}
 	
+ 	
 	// =================== session相关 ===================

 	/** 
@@ -189,6 +196,46 @@ public class StpUserUtil {
 		return stpLogic.getSession();
 	}

+
+
+	// =================== 过期时间相关 ===================  
+
+ 	/**
+ 	 * 获取当前登录者的token剩余有效时间 (单位: 秒)
+ 	 * @return token剩余有效时间
+ 	 */
+ 	public long getTimeout() {
+ 		return stpLogic.getTokenTimeout();
+ 	}
+ 	
+ 	/**
+ 	 * 获取指定loginId的token剩余有效时间 (单位: 秒) 
+ 	 * @param loginId 指定loginId 
+ 	 * @return token剩余有效时间 
+ 	 */
+ 	public long getTimeoutByLoginId(Object loginId) {
+ 		return stpLogic.getTokenTimeoutByLoginId(loginId);
+ 	}
+
+ 	/**
+ 	 * 获取当前登录者的Session剩余有效时间 (单位: 秒)
+ 	 * @return token剩余有效时间
+ 	 */
+ 	public long getSessionTimeout() {
+ 		return stpLogic.getSessionTimeout();
+ 	}
+ 	
+ 	/**
+ 	 * 获取指定loginId的Session剩余有效时间 (单位: 秒) 
+ 	 * @param loginId 指定loginId 
+ 	 * @return token剩余有效时间 
+ 	 */
+ 	public long getSessionTimeoutByLoginId(Object loginId) {
+ 		return stpLogic.getSessionTimeoutByLoginId(loginId);
+ 	}
+ 	
+ 	
+	
 	// =================== 权限验证操作 ===================

 	/** 
@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.session.SaSessionCustomUtil;
+import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpUtil;

 /**
@@ -18,6 +19,7 @@ import cn.dev33.satoken.stp.StpUtil;
@RequestMapping("/test/")
 public class TestController {

+	
 	// 测试登录接口， 浏览器访问： http://localhost:8081/test/login
 	@RequestMapping("login")
 	public AjaxJson login(@RequestParam(defaultValue="10001") String id) {
@@ -97,8 +99,9 @@ public class TestController {
 	@RequestMapping("tokenInfo")
 	public AjaxJson tokenInfo() {
 		System.out.println("======================= 进入方法，打印当前token信息 ========================= ");
-		System.out.println(StpUtil.getTokenInfo());
-		return AjaxJson.getSuccess();
+		SaTokenInfo tokenInfo = StpUtil.getTokenInfo();
+		System.out.println(tokenInfo);
+		return AjaxJson.getSuccessData(tokenInfo);
 	}
 	
 	
@@ -109,18 +112,27 @@ public class TestController {
 	public AjaxJson atCheck() {
 		System.out.println("======================= 进入方法，测试注解鉴权接口 ========================= ");
 		System.out.println("只有通过注解鉴权，才能进入此方法");
+		StpUtil.checkActivityTimeout();
+		StpUtil.updateLastActivityToNow();
 		return AjaxJson.getSuccess();
 	}
 	
-	// 测试注解式鉴权， 浏览器访问： http://localhost:8081/test/getInfo
+	// 测试注解式鉴权， 浏览器访问： http://localhost:8081/test/atLogin
 	@SaCheckLogin				// 注解式鉴权：当前会话必须登录才能通过 
-	@RequestMapping("getInfo")
-	public AjaxJson getInfo() {
+	@RequestMapping("atLogin")
+	public AjaxJson atLogin() {
 		return AjaxJson.getSuccessData("用户信息");
 	}
 	
 	
-
+	// [活动时间] 续签： http://localhost:8081/test/rene
+	@RequestMapping("rene")
+	public AjaxJson rene() {
+		StpUtil.checkActivityTimeout();
+		StpUtil.updateLastActivityToNow();
+		return AjaxJson.getSuccess("续签成功");
+	}
+	

 	// 测试踢人下线   浏览器访问： http://localhost:8081/test/kickOut 
 	@RequestMapping("kickOut")
@@ -7,8 +7,10 @@ spring:
    sa-token: 
        # token名称 (同时也是cookie名称)
        token-name: satoken
-        # token有效期，单位s 默认30天
+        # token有效期，单位s 默认30天, -1代表永不过期 
        timeout: 2592000
+        # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒, 默认-1 代表不限制 (例如可以设置为1800代表30分钟内无操作就过期) 
+        activity-timeout: -1
        # 在多人登录同一账号时，是否共享会话 (为true时共用一个，为false时新登录挤掉旧登录)
        is-share: true
        # 是否尝试从请求体里读取token
@@ -22,7 +24,7 @@ spring:
        # 是否在初始化配置时打印版本字符画
        is-v: true
        
-          
+        
    # redis配置 
    redis:
        # Redis数据库索引（默认为0）
@@ -1,128 +0,0 @@
-package cn.dev33.satoken;
-
-import cn.dev33.satoken.action.SaTokenAction;
-import cn.dev33.satoken.action.SaTokenActionDefaultImpl;
-import cn.dev33.satoken.config.SaTokenConfig;
-import cn.dev33.satoken.config.SaTokenConfigFactory;
-import cn.dev33.satoken.cookie.SaCookieOper;
-import cn.dev33.satoken.cookie.SaCookieOperDefaultImpl;
-import cn.dev33.satoken.dao.SaTokenDao;
-import cn.dev33.satoken.dao.SaTokenDaoDefaultImpl;
-import cn.dev33.satoken.stp.StpInterface;
-import cn.dev33.satoken.stp.StpInterfaceDefaultImpl;
-import cn.dev33.satoken.util.SaTokenInsideUtil;
-
-/**
- * 管理sa-token所有对象 
- * @author kong
- *
- */
-public class SaTokenManager {
-
-	
-	/**
-	 * 配置文件 Bean 
-	 */
-	private static SaTokenConfig config;	
-	public static SaTokenConfig getConfig() {
-		if (config == null) {
-			initConfig();
-		}
-		return config;
-	}
-	public static void setConfig(SaTokenConfig config) {
-		SaTokenManager.config = config;
-		if(config.getIsV()) {
-			SaTokenInsideUtil.printSaToken();
-		}
-	}
-	public synchronized static void initConfig() {
-		if (config == null) {
-			setConfig(SaTokenConfigFactory.createConfig());
-		}
-	}
-	
-	/**
-	 * 持久化 Bean 
-	 */
-	public static SaTokenDao dao;
-	public static SaTokenDao getDao() {
-		if (dao == null) {
-			initDao();
-		}
-		return dao;
-	}
-	public static void setDao(SaTokenDao dao) {
-		SaTokenManager.dao = dao;
-	}
-	public synchronized static void initDao() {
-		if (dao == null) {
-			setDao(new SaTokenDaoDefaultImpl());
-		}
-	}
-	
-	/**
-	 * 权限认证 Bean 
-	 */
-	public static StpInterface stp;
-	public static StpInterface getStp() {
-		if (stp == null) {
-			initStp();
-		}
-		return stp;
-	}
-	public static void setStp(StpInterface stp) {
-		SaTokenManager.stp = stp;
-	}
-	public synchronized static void initStp() {
-		if (stp == null) {
-			setStp(new StpInterfaceDefaultImpl());
-		}
-	}
-	
-	/**
-	 * sa-token行为 Bean 
-	 */
-	public static SaTokenAction sta;
-	public static SaTokenAction getSta() {
-		if (sta == null) {
-			initSta();
-		}
-		return sta;
-	}
-	public static void setSta(SaTokenAction sta) {
-		SaTokenManager.sta = sta;
-	}
-	public synchronized static void initSta() {
-		if (sta == null) {
-			setSta(new SaTokenActionDefaultImpl());
-		}
-	}
-
-	/**
-	 * sa-token cookie操作 Bean 
-	 */
-	public static SaCookieOper saCookieOper;
-	public static SaCookieOper getSaCookieOper() {
-		if (saCookieOper == null) {
-			initSaCookieOper();
-		}
-		return saCookieOper;
-	}
-	public static void setSaCookieOper(SaCookieOper saCookieOper) {
-		SaTokenManager.saCookieOper = saCookieOper;
-	}
-	public synchronized static void initSaCookieOper() {
-		if (saCookieOper == null) {
-			setSaCookieOper(new SaCookieOperDefaultImpl());
-		}
-	}
-	
-	
-	
-	
-	
-	
-	
-	
-}
@@ -1,69 +0,0 @@
-package cn.dev33.satoken.dao;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import cn.dev33.satoken.session.SaSession;
-
-/**
- * sa-token持久层默认的实现类 , 基于内存Map 
- * @author kong
- *
- */
-public class SaTokenDaoDefaultImpl implements SaTokenDao {
-
-	/**
-	 * 所有数据集合 
-	 */
-	Map<String, Object> dataMap = new HashMap<String, Object>();
-
-	
-	@Override
-	public String getValue(String key) {
-		return (String)dataMap.get(key);
-	}
-
-	@Override
-	public void setValue(String key, String value, long timeout) {
-		dataMap.put(key, value);
-	}
-
-	@Override
-	public void updateValue(String key, String value) {
-		this.setValue(key, value, 0);
-	}
-
-	@Override
-	public void delKey(String key) {
-		dataMap.remove(key);
-	}
-
-	
-	@Override
-	public SaSession getSaSession(String sessionId) {
-		return (SaSession)dataMap.get(sessionId);
-	}
-
-	@Override
-	public void saveSaSession(SaSession session, long timeout) {
-		dataMap.put(session.getId(), session);
-	}
-
-	@Override
-	public void updateSaSession(SaSession session) {
-		// 无动作 
-	}
-
-	@Override
-	public void deleteSaSession(String sessionId) {
-		dataMap.remove(sessionId);
-	}
-	
-	
-
-	
-	
-	
-	
-	
-}
@@ -1,80 +0,0 @@
-package cn.dev33.satoken.spring;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import cn.dev33.satoken.SaTokenManager;
-import cn.dev33.satoken.action.SaTokenAction;
-import cn.dev33.satoken.config.SaTokenConfig;
-import cn.dev33.satoken.cookie.SaCookieOper;
-import cn.dev33.satoken.dao.SaTokenDao;
-import cn.dev33.satoken.stp.StpInterface;
-
-/**
- * 与SpringBoot集成, 保证此类被扫描，即可完成sa-token与SpringBoot的集成 
- * @author kong
- *
- */
-@Component
-public class SpringSaToken {
-
-	
-	/**
-	 * 获取配置Bean 
-	 * @return .
-	 */
-	@Bean
-	@ConfigurationProperties(prefix="spring.sa-token")
-	public SaTokenConfig getSaTokenConfig() {
-		return new SaTokenConfig();
-	}
-	
-	/**
-	 * 注入配置Bean 
-	 * @param saTokenConfig .
-	 */
-	@Autowired
-	public void setConfig(SaTokenConfig saTokenConfig){
-		SaTokenManager.setConfig(saTokenConfig);
-	}
-
-	/**
-	 * 注入持久化Bean 
-	 * @param dao .
-	 */
-	@Autowired(required = false)
-	public void setDao(SaTokenDao dao){
-		SaTokenManager.setDao(dao);
-	}
-
-	/**
-	 * 注入权限认证Bean 
-	 * @param stp .
-	 */
-	@Autowired(required = false)
-	public void setStp(StpInterface stp){
-		SaTokenManager.setStp(stp);
-	}
-
-	/**
-	 * 注入Cookie操作Bean 
-	 * @param saCookieOper .
-	 */
-	@Autowired(required = false)
-	public void setSaCookieOper(SaCookieOper saCookieOper){
-		SaTokenManager.setSaCookieOper(saCookieOper);
-	}
-
-	/**
-	 * 注入框架行为Bean 
-	 * @param sta .
-	 */
-	@Autowired(required = false)
-	public void setSta(SaTokenAction sta){
-		SaTokenManager.setSta(sta);
-	}
-	
-	
-}
@@ -1,505 +0,0 @@
-package cn.dev33.satoken.stp;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
-import cn.dev33.satoken.SaTokenManager;
-import cn.dev33.satoken.config.SaTokenConfig;
-import cn.dev33.satoken.dao.SaTokenDao;
-import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.exception.NotPermissionException;
-import cn.dev33.satoken.session.SaSession;
-import cn.dev33.satoken.util.SaTokenInsideUtil;
-
-/**
- * sa-token 权限验证，逻辑 实现类 
- * <p>
- * (stp = sa-token-permission 的缩写 )
- * @author kong
- */
-public class StpLogic {
-
-	/**
-	 * 持久化的key前缀，多账号体系时以此值区分，比如：login、user、admin
-	 */
-	public String loginKey = "";		
-	
-	/**
-	 * 初始化StpLogic, 并制定loginKey
-	 * @param loginKey .
-	 */
-	public StpLogic(String loginKey) {
-		this.loginKey = loginKey;
-	}
-
-	
-	// =================== 获取token 相关 ===================  
-	
-	/**
-	 * 返回token名称 
-	 * @return 此StpLogic的token名称
-	 */
-	public String getTokenName() {
- 		return getKeyTokenName();
- 	}
-
-	/**
-	 * 随机生成一个tokenValue
-	 * @param loginId loginId
-	 * @return 生成的tokenValue 
-	 */
- 	public String randomTokenValue(Object loginId) {
-		return SaTokenManager.getSta().createToken(loginId, loginKey);
-	}
-	
-	/**
-	 *  获取当前tokenValue
-	 * @return 当前tokenValue
-	 */
-	public String getTokenValue(){
-		// 0、获取相应对象 
-		HttpServletRequest request = SaTokenManager.getSta().getCurrRequest();
-		SaTokenConfig config = SaTokenManager.getConfig();
-		String keyTokenName = getTokenName();
-		
-		// 1、尝试从request里读取 
-		if(request.getAttribute(SaTokenInsideUtil.JUST_CREATED_SAVE_KEY) != null) {
-			return String.valueOf(request.getAttribute(SaTokenInsideUtil.JUST_CREATED_SAVE_KEY));
-		}
-		// 2、尝试从请求体里面读取 
-		if(config.getIsReadBody() == true){
-			String tokenValue = request.getParameter(keyTokenName);
-			if(tokenValue != null) {
-				return tokenValue;
-			}
-		}
-		// 3、尝试从header力读取 
-		if(config.getIsReadHead() == true){
-			String tokenValue = request.getHeader(keyTokenName);
-			if(tokenValue != null) {
-				return tokenValue;
-			}
-		}
-		// 4、尝试从cookie里读取 
-		if(config.getIsReadCookie() == true){
-			Cookie cookie = SaTokenManager.getSaCookieOper().getCookie(request, keyTokenName);
-			if(cookie != null){
-				String tokenValue = cookie.getValue();
-				if(tokenValue != null) {
-					return tokenValue;
-				}
-			}
-		}
-		// 5、都读取不到，那算了吧还是  
-		return null;
-	}
-	
-	/** 
-	 * 获取指定id的tokenValue
-	 * @param loginId .
-	 * @return .
-	 */
-	public String getTokenValueByLoginId(Object loginId) {
-		return SaTokenManager.getDao().getValue(getKeyLoginId(loginId)); 
-	}
-	
-	/**
-	 * 获取当前会话的token信息：tokenName与tokenValue
-	 * @return 一个Map对象 
-	 */
-	public Map<String, String> getTokenInfo() {
-		Map<String, String> map = new HashMap<String, String>();
-		map.put("tokenName", getTokenName());
-		map.put("tokenValue", getTokenValue());
-		return map;
-	}
-	
-	
-	// =================== 登录相关操作 ===================  
-
-	/**
-	 * 在当前会话上登录id 
-	 * @param loginId 登录id ，建议的类型：（long | int | String）
-	 */
-	public void setLoginId(Object loginId) {
-		
-		// 1、获取相应对象  
-		HttpServletRequest request = SaTokenManager.getSta().getCurrRequest();
-		SaTokenConfig config = SaTokenManager.getConfig();
-		SaTokenDao dao = SaTokenManager.getDao();
-		
-		// 2、获取tokenValue
-		String tokenValue = getTokenValueByLoginId(loginId);	// 获取旧tokenValue
-		if(tokenValue == null){			// 为null则创建一个新的
-			tokenValue = randomTokenValue(loginId);
-		} else {
-			// 不为null, 并且配置不共享，则：将原来的标记为[被顶替] 
-			if(config.getIsShare() == false){
-//				dao.delKey(getKeyTokenValue(tokenValue)); 
-				dao.updateValue(getKeyTokenValue(tokenValue), NotLoginException.BE_REPLACED);
-				tokenValue = randomTokenValue(loginId);
-			}
-		}
-
-		// 3、持久化 
-		dao.setValue(getKeyTokenValue(tokenValue), String.valueOf(loginId), config.getTimeout());	// token -> uid 
-		dao.setValue(getKeyLoginId(loginId), tokenValue, config.getTimeout());							// uid -> token 
-		request.setAttribute(SaTokenInsideUtil.JUST_CREATED_SAVE_KEY, tokenValue);								// 保存到本次request里  
-		if(config.getIsReadCookie() == true){
-			SaTokenManager.getSaCookieOper().addCookie(SaTokenManager.getSta().getResponse(), getTokenName(), tokenValue, "/", (int)config.getTimeout());		// cookie注入 
-		}
-	}
-
-	/** 
-	 * 当前会话注销登录
-	 */
-	public void logout() {
-		// 如果连token都没有，那么无需执行任何操作 
-		String tokenValue = getTokenValue();
- 		if(tokenValue == null) {
- 			return;
- 		}
- 		// 如果打开了cookie模式，第一步，先把cookie清除掉 
- 		if(SaTokenManager.getConfig().getIsReadCookie() == true){
-			SaTokenManager.getSaCookieOper().delCookie(SaTokenManager.getSta().getCurrRequest(), SaTokenManager.getSta().getResponse(), getTokenName()); 	
-		}
- 		// 尝试从db中获取loginId值 
- 		String loginId = SaTokenManager.getDao().getValue(getKeyTokenValue(tokenValue));
- 		// 如果根本查不到loginId，那么也无需执行任何操作 
- 		if(loginId == null) {
- 			return;
- 		}
- 		// 如果已过期或被顶替或被挤下线，那么只删除此token即可 
- 		if(loginId.equals(NotLoginException.TOKEN_TIMEOUT) || loginId.equals(NotLoginException.BE_REPLACED) || loginId.equals(NotLoginException.KICK_OUT)) {
- 			return;
- 		}
-		// 至此，已经是一个正常的loginId，开始三清 
- 		logoutByLoginId(loginId);
-	}
-
-	/**
-	 * 指定loginId的会话注销登录（清退下线）
-	 * @param loginId 账号id 
-	 */
-	public void logoutByLoginId(Object loginId) {
-		
-		// 获取相应tokenValue
-		String tokenValue = getTokenValueByLoginId(loginId);
-		if(tokenValue == null) {
-			return;
-		}
-		
-		// 清除相关数据 
-		SaTokenManager.getDao().delKey(getKeyTokenValue(tokenValue));	// 清除token-id键值对  
-		SaTokenManager.getDao().delKey(getKeyLoginId(loginId));		// 清除id-token键值对  
-		SaTokenManager.getDao().deleteSaSession(getKeySession(loginId));		// 清除其session 
-	}
-
-	/**
-	 * 指定loginId的会话注销登录（踢人下线）
-	 * @param loginId 账号id 
-	 */
-	public void kickoutByLoginId(Object loginId) {
-		
-		// 获取相应tokenValue
-		String tokenValue = getTokenValueByLoginId(loginId);
-		if(tokenValue == null) {
-			return;
-		}
-		
-		// 清除相关数据 
-		SaTokenManager.getDao().updateValue(getKeyTokenValue(tokenValue), NotLoginException.KICK_OUT);	// 标记：已被踢下线 
-		SaTokenManager.getDao().delKey(getKeyLoginId(loginId));		// 清除id-token键值对  
-		SaTokenManager.getDao().deleteSaSession(getKeySession(loginId));		// 清除其session 
-	}
-	
-	// 查询相关 
-	
- 	/** 
- 	 * 获取当前会话是否已经登录
- 	 * @return 是否已登录 
- 	 */
- 	public boolean isLogin() {
- 		// 判断条件：不为null，并且不在异常项集合里 
- 		return getLoginIdDefaultNull() != null;
- 	}
- 	
- 	/** 
- 	 * 检验当前会话是否已经登录，如未登录，则抛出异常
- 	 */
- 	public void checkLogin() {
- 		getLoginId();
- 	}
- 	
- 	/** 
- 	 * 获取当前会话登录id, 如果未登录，则抛出异常
- 	 * @return .
- 	 */
- 	public Object getLoginId() {
- 		// 如果获取不到token，则抛出：无token
- 		String tokenValue = getTokenValue();
- 		if(tokenValue == null) {
- 			throw NotLoginException.newInstance(loginKey, NotLoginException.NOT_TOKEN);
- 		}
- 		// 查找此token对应loginId, 则抛出：无效token 
- 		String loginId = SaTokenManager.getDao().getValue(getKeyTokenValue(tokenValue));
- 		if(loginId == null) {
- 			throw NotLoginException.newInstance(loginKey, NotLoginException.INVALID_TOKEN);
- 		}
- 		// 如果是已经过期，则抛出已经过期 
- 		if(loginId.equals(NotLoginException.TOKEN_TIMEOUT)) {
- 			throw NotLoginException.newInstance(loginKey, NotLoginException.TOKEN_TIMEOUT);
- 		}
- 		// 如果是已经被顶替下去了, 则抛出：已被顶下线 
- 		if(loginId.equals(NotLoginException.BE_REPLACED)) {
- 			throw NotLoginException.newInstance(loginKey, NotLoginException.BE_REPLACED);
- 		}
- 		// 如果是已经被踢下线了, 则抛出：已被踢下线
- 		if(loginId.equals(NotLoginException.KICK_OUT)) {
- 			throw NotLoginException.newInstance(loginKey, NotLoginException.KICK_OUT);
- 		}
- 		// 至此，返回loginId
- 		return loginId;
- 	}
-	
-	/** 
-	 * 获取当前会话登录id, 如果未登录，则返回默认值
-	 * @param defaultValue .
-	 * @return .
-	 */
- 	@SuppressWarnings("unchecked")
-	public <T>T getLoginId(T defaultValue) {
-		Object loginId = getLoginIdDefaultNull();
-		// 如果loginId为null，则返回默认值 
-		if(loginId == null) {
-			return defaultValue;
-		}
-		// 开始尝试类型转换，只尝试三种类型：int、long、String 
-		if(defaultValue instanceof Integer) {
-			return (T)Integer.valueOf(loginId.toString());
-		}
-		if(defaultValue instanceof Long) {
-			return (T)Long.valueOf(loginId.toString());
-		}
-		if(defaultValue instanceof String) {
-			return (T)loginId.toString();
-		}
-		return (T)loginId;
- 	}
- 	
-	/** 
-	 * 获取当前会话登录id, 如果未登录，则返回null
-	 * @return .
-	 */
-	public Object getLoginIdDefaultNull() {
-		// 如果连token都是空的，则直接返回 
-		String tokenValue = getTokenValue();
- 		if(tokenValue == null) {
- 			return null;
- 		}
- 		// loginId为null或者在异常项里面，均视为未登录
- 		Object loginId = SaTokenManager.getDao().getValue(getKeyTokenValue(tokenValue));
- 		if(loginId == null || NotLoginException.ABNORMAL_LIST.contains(loginId)) {
- 			return null;
- 		}
- 		// 执行到此，证明loginId已经是个正常的账号id了 
- 		return loginId;
- 	}
-
-	/** 
-	 * 获取当前会话登录id, 并转换为String
-	 * @return
-	 */
- 	public String getLoginIdAsString() {
- 		return String.valueOf(getLoginId());
- 	}
-
-	/** 
-	 * 获取当前会话登录id, 并转换为int
-	 * @return .
-	 */
- 	public int getLoginIdAsInt() {
- 		// Object loginId = getLoginId();
-// 		if(loginId instanceof Integer) {
-// 			return (Integer)loginId;
-// 		}
- 		return Integer.valueOf(String.valueOf(getLoginId()));
- 	}
-
-	/**
-	 * 获取当前会话登录id, 并转换为long
-	 * @return .
-	 */
- 	public long getLoginIdAsLong() {
-// 		Object loginId = getLoginId();
-// 		if(loginId instanceof Long) {
-// 			return (Long)loginId;
-// 		}
- 		return Long.valueOf(String.valueOf(getLoginId()));
- 	}
- 	
- 	/** 
- 	 * 获取指定token对应的登录id，如果未登录，则返回 null 
- 	 * @return .
- 	 */
- 	public Object getLoginIdByToken(String tokenValue) {
- 		if(tokenValue != null) {
- 			Object loginId = SaTokenManager.getDao().getValue(getKeyTokenValue(tokenValue));
- 			if(loginId != null) {
- 				return loginId;
- 			}
- 		}
- 		return null;
- 	}
- 	
- 	
-	// =================== session相关 ===================  
-
-	/** 
-	 * 获取指定key的session, 如果没有，isCreate=是否新建并返回
-	 * @param sessionId .
-	 * @param isCreate .
-	 * @return .
-	 */
-	protected SaSession getSessionBySessionId(String sessionId, boolean isCreate) {
-		SaSession session = SaTokenManager.getDao().getSaSession(sessionId);
-		if(session == null && isCreate) {
-			session = new SaSession(sessionId);
-			SaTokenManager.getDao().saveSaSession(session, SaTokenManager.getConfig().getTimeout());
-		}
-		return session;
-	}
-
-	/** 
-	 * 获取指定loginId的session, 如果没有，isCreate=是否新建并返回
-	 * @param loginId 登录id
-	 * @param isCreate 是否新建
-	 * @return SaSession
-	 */
-	public SaSession getSessionByLoginId(Object loginId, boolean isCreate) {
-		return getSessionBySessionId(getKeySession(loginId), isCreate);
-	}
-
-	/** 
-	 * 获取指定loginId的session
-	 * @param loginId .
-	 * @return .
-	 */
-	public SaSession getSessionByLoginId(Object loginId) {
-		return getSessionByLoginId(loginId, true);
-	}
-	
-	/** 
-	 * 获取当前会话的session
-	 * @return
-	 */
-	public SaSession getSession() {
-		return getSessionByLoginId(getLoginId());
-	}
- 	
-	
-
-	// =================== 权限验证操作 ===================  
-
- 	/** 
- 	 * 指定loginId是否含有指定权限
- 	 * @param loginId .
- 	 * @param pcode .
- 	 * @return .
- 	 */
- 	public boolean hasPermission(Object loginId, Object pcode) {
- 		List<Object> pcodeList = SaTokenManager.getStp().getPermissionCodeList(loginId, loginKey);
-		return !(pcodeList == null || pcodeList.contains(pcode) == false);
- 	}
- 	
- 	/** 
- 	 * 当前会话是否含有指定权限
- 	 * @param pcode .
- 	 * @return .
- 	 */
- 	public boolean hasPermission(Object pcode) {
- 		return hasPermission(getLoginId(), pcode);
- 	}
-	
- 	/** 
- 	 * 当前账号是否含有指定权限 ， 没有就抛出异常
- 	 * @param pcode .
- 	 */
- 	public void checkPermission(Object pcode) {
- 		if(hasPermission(pcode) == false) {
-			throw new NotPermissionException(pcode, this.loginKey);
-		}
- 	}
-
- 	/** 
- 	 * 当前账号是否含有指定权限 ， 【指定多个，必须全都有】
- 	 * @param pcodeArray .
- 	 */
- 	public void checkPermissionAnd(Object... pcodeArray){
- 		Object loginId = getLoginId();
- 		List<Object> pcodeList = SaTokenManager.getStp().getPermissionCodeList(loginId, loginKey);
- 		for (Object pcode : pcodeArray) {
- 			if(pcodeList.contains(pcode) == false) {
- 				throw new NotPermissionException(pcode, this.loginKey);	// 没有权限抛出异常 
- 			}
- 		}
- 	}
-
- 	/** 
- 	 * 当前账号是否含有指定权限 ， 【指定多个，有一个就可以了】
- 	 * @param pcodeArray .
- 	 */
- 	public void checkPermissionOr(Object... pcodeArray){
- 		Object loginId = getLoginId();
- 		List<Object> pcodeList = SaTokenManager.getStp().getPermissionCodeList(loginId, loginKey);
- 		for (Object pcode : pcodeArray) {
- 			if(pcodeList.contains(pcode) == true) {
- 				return;		// 有的话提前退出
- 			}
- 		}
-		if(pcodeArray.length > 0) {
-	 		throw new NotPermissionException(pcodeArray[0], this.loginKey);	// 没有权限抛出异常 
-		}
- 	}
- 	
-	
-	// =================== 返回相应key ===================  
-
-	/**
-	 *  获取key：客户端 tokenName 
-	 * @return
-	 */
-	public String getKeyTokenName() {
- 		return SaTokenManager.getConfig().getTokenName();
- 	}
-	/**  
-	 * 获取key： tokenValue 持久化
-	 * @param tokenValue .
-	 * @return
-	 */
-	public String getKeyTokenValue(String tokenValue) {
-		return SaTokenManager.getConfig().getTokenName() + ":" + loginKey + ":token:" + tokenValue;
-	}
-	/** 
-	 * 获取key： id 持久化
-	 * @param loginId .
-	 * @return
-	 */
-	public String getKeyLoginId(Object loginId) {
-		return SaTokenManager.getConfig().getTokenName() + ":" + loginKey + ":id:" + loginId;
-	}
-	/** 
-	 * 获取key： session 持久化  
-	 * @param loginId .
-	 * @return .
-	 */
-	public String getKeySession(Object loginId) {
-		return SaTokenManager.getConfig().getTokenName() + ":" + loginKey + ":session:" + loginId;
-	}
- 	
-	
-}
@@ -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.6.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">sa-token v1.7.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.6.0-2B9939"></a>
+	<a href="https://github.com/click33/sa-token"><img src="https://img.shields.io/badge/sa--token-v1.7.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>
@@ -58,6 +58,7 @@ StpUtil.checkLogin();
 - ⚡ **无cookie模式** —— APP、小程序等前后台分离场景 
 - ⚡ **注解式鉴权** —— 优雅的将鉴权与业务代码分离
 - ⚡ **花式token生成** —— 内置六种token风格，还可自定义token生成策略
+- ⚡ **自动续签** —— 提供两种token过期策略，灵活搭配使用，还可自动续签
 - ⚡ **组件自动注入** —— 零配置与Spring等框架集成
 - ⚡ **更多功能正在集成中...** —— 如有您有好想法或者建议，欢迎加群交流

@@ -25,6 +25,7 @@

 - **附录**
 	- [未登录场景值](/fun/not-login-scene)
+	- [token有效期详解](/fun/token-timeout)
 	


@@ -0,0 +1,45 @@
+# token有效期详解
+
+<!-- 本篇介绍token有效期的详细用法 -->
+
+`sa-token` 提供两种token自动过期策略，分别是`timeout`与`activity-timeout`，其详细用法如下：
+
+
+### timeout
+- `timeout`代表token的长久有效期，单位/秒，例如将其配置为`2592000`(30天)，代表在30天后，token必定过期，无法继续使用
+- `timeout`无法续签，想要继续使用必须重新登录
+- `timeout`的值配置为-1后，代表永久有效，不会过期
+
+
+### activity-timeout
+- `activity-timeout`代表临时有效期，单位/秒，例如将其配置为`1800`(30分钟)，代表用户如果30分钟无操作，则此token会立即过期
+- 如果在30分钟内用户有操作，则会再次续签30分钟，用户如果一直操作则会一直续签，直到连续30分钟无操作，token才会过期
+- `activity-timeout`的值配置为-1后，代表永久有效，不会过期，此时也无需频繁续签
+
+
+### 关于activity-timeout的续签
+如果`activity-timeout`配置了大于零的值，`sa-token`会在登录时开始计时，在每次直接或间接调用`getLoginId()`时进行一次过期检查与续签操作。
+此时会有两种情况：
+- 一种是会话无操作时间太长，token已经过期，此时框架会抛出`NotLoginException`异常(场景值=-3)，
+- 另一种则是会话在`activity-timeout`有效期内通过检查，此时token可以成功续签 
+
+
+### 我可以手动续签吗？
+**可以！**
+如果框架的自动续签算法无法满足您的业务需求，你可以进行手动续签，`sa-token`提供两个API供你操作：
+- `StpUtil.checkActivityTimeout()`: 检查当前token 是否已经[临时过期]，如果已经过期则抛出异常
+- `StpUtil.updateLastActivityToNow()`: 续签当前token：(将 [最后操作时间] 更新为当前时间戳) 
+- 注意：在手动续签时，即时token已经 [临时过期] 也可续签成功，如果此场景下需要提示续签失败，可采用先检查再续签的形式保证token有效性 
+- 例如以下代码：
+``` java
+	// 先检查是否已过期
+	StpUtil.checkActivityTimeout();
+	// 检查通过后继续续签
+	StpUtil.updateLastActivityToNow();
+```
+
+
+### timeout与activity-timeout可以同时使用吗？
+**可以同时使用！**
+两者的认证逻辑彼此独立，互不干扰，可以同时使用。
+
@@ -7,9 +7,9 @@
 		<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会话、踢人下线、持久层扩展、无cookie模式、模拟他人账号、多账号体系、注解式鉴权、花式token、Spring集成...，零配置开箱即用，覆盖所有应用场景，你所需要的功能，这里都有">
+		<meta name="description" content="sa-token是一个JavaWeb权限认证框架，强大、简单、好用，登录验证、权限验证、自定义session会话、踢人下线、持久层扩展、无cookie模式、模拟他人账号、多账号体系、注解式鉴权、花式token、自动续签、Spring集成...，零配置开箱即用，覆盖所有应用场景，你所需要的功能，这里都有">
 		<link rel="stylesheet" href="https://unpkg.com/docsify@4.11.3/lib/themes/vue.css">
-		<link rel="stylesheet" href="./index.css">
+		<link rel="stylesheet" href="./lib/index.css">
 		<link rel="shortcut icon" type="image/x-icon" href="logo.png">
 	</head>
 	<body>
@@ -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.5.1/doc/index.html">v1.5.1</option>
 				<option value="http://sa-token.dev33.cn/v/v1.4.0/doc/index.html">v1.4.0</option>
 			</select>
 			<a href="/">首页</a>
@@ -34,7 +35,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.6.0</sub>'
+			name += '<b style="font-size: 24px; vertical-align: middle;">sa-token</b> <sub>v1.7.0</sub>'
 			window.$docsify = {
 				name: name, // 名字 
 				repo: 'https://github.com/click33/sa-token', // github地址 
@@ -58,11 +59,12 @@
 					function(hook, vm) {
 						// 解析之后执行 
 						hook.afterEach(function(html) {
-							var url = 'https://github.com/click33/sa-token/tree/master/sa-token-doc/doc/' + vm.route.file;
+							var url = 'https://gitee.com/sz6/sa-token/tree/dev/sa-token-doc/doc/' + vm.route.file;
+							var url2 = 'https://github.com/click33/sa-token/tree/dev/sa-token-doc/doc/' + vm.route.file;
 							var footer = [
 								'<br/><br/><br/><br/><br/><br/><br/><hr/>',
 								'<footer>',
-								'&emsp;<span>发现错误？想参与编辑？ <a href="' + url + '" target="_blank">在 GitHub 上编辑此页！</a> </span>',
+								'<span>发现错误？想参与编辑？ 在 <a href="' + url + '" target="_blank">Gitee</a> 或 <a href="' + url2 + '" target="_blank">GitHub</a> 上编辑此页！</span>',
 								'</footer>'
 							].join('');
 							return html + footer;
@@ -1,6 +1,16 @@
 # 更新日志 


+### 2020-12-24 @v1.7.0
+- 优化：项目架构改为maven多模块形式，方便增加新模块 **[重要]**
+- 优化：与`springboot`的集成改为`springboot-starter`模式，无需`@SaTokenSetup`注解即可完成自动装配 **[重要]**
+- 新增：新增`activity-timeout`配置，可控制token临时过期与续签功能 **[重要]**
+- 新增：`timeout`过期时间新增-1值，代表永不过期 
+- 新增：`StpUtil.getTokenInfo()`改为对象形式，新增部分常用字段 
+- 优化：解决在无cookie模式下，不集成redis时会话无法主动过期的问题 
+- 修复：修复文档首页样式问题 
+
+
 ### 2020-12-17 @v1.6.0
 - 新增：花式token生成方案 **[重要]** 
 - 优化：优化`readme.md` 
@@ -8,8 +8,8 @@
 <!-- sa-token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
 <dependency>
 	<groupId>cn.dev33</groupId>
-	<artifactId>sa-token</artifactId>
-	<version>1.6.0</version>
+	<artifactId>sa-token-spring-boot-starter</artifactId>
+	<version>1.7.0</version>
 </dependency>
 ```

@@ -22,16 +22,17 @@
 - gitee地址：[https://gitee.com/sz6/sa-token](https://gitee.com/sz6/sa-token)
 - 开源不易，求鼓励，给个`star`吧
 - 源码目录介绍
-	- sa-token-dev: 源码
-	- sa-token-demo-springboot: springboot集成示例 
-	- sa-token-doc: 文档介绍 
+	- `sa-token-dev`: 源码
+	- `sa-token-spring-boot-starter`: springboot插件化集成
+	- `sa-token-demo-springboot`: springboot集成示例 
+	- `sa-token-doc`: 文档介绍 



 ## jar包下载
 [点击下载：sa-token-1.6.0.jar](https://oss.dev33.cn/sa-token/sa-token-1.6.0.jar)

-
+(注意：当前仅提供`v1.6.0`版本jar包下载，更多版本请前往maven中央仓库获取)



@@ -17,13 +17,13 @@
 <!-- sa-token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
 <dependency>
 	<groupId>cn.dev33</groupId>
-	<artifactId>sa-token</artifactId>
-	<version>1.6.0</version>
+	<artifactId>sa-token-spring-boot-starter</artifactId>
+	<version>1.7.0</version>
 </dependency>
 ```

 #### 3、配置文件
- 你可以零配置启动项目
+- 你可以**零配置启动项目**
 - 但同时你也可以在`application.yml`中增加如下配置，定制性使用框架：

 ``` java
@@ -32,8 +32,10 @@ spring:
    sa-token: 
        # token名称 (同时也是cookie名称)
        token-name: satoken
-        # token有效期，单位s 默认30天
+        # token有效期，单位s 默认30天, -1代表永不过期 
        timeout: 2592000
+        # token临时有效期, 默认-1 代表不限制    
+        activity-timeout: -1
        # 在多人登录同一账号时，是否共享会话 (为true时共用一个，为false时新登录挤掉旧登录)
        is-share: true
        # 是否尝试从请求体里读取token
@@ -42,6 +44,8 @@ spring:
        is-read-head: true
        # 是否尝试从cookie里读取token
        is-read-cookie: true
+        # token风格
+        token-style: uuid
        # 是否在初始化配置时打印版本字符画
        is-v: true
 ```
@@ -53,7 +57,6 @@ spring:
 在项目中新建包 `com.pj` ，在此包内新建主类 `SaTokenDemoApplication.java`，输入以下代码：

 ``` java
-@SaTokenSetup // 标注启动 sa-token
@SpringBootApplication
 public class SaTokenDemoApplication {
 	public static void main(String[] args) throws JsonProcessingException {
@@ -1,52 +1,12 @@
 # 框架配置
- 你可以零配置启动框架
+- 你可以**零配置启动框架**
 - 但同时你也可以通过配置，定制性使用框架，`sa-token`支持多种方式配置框架信息

--- 
-### 所有可配置项
-| 参数名称		| 类型		| 默认值	| 说明																				|
-| :--------		| :--------	| :--------	| :--------																			|
-| tokenName		| String	| satoken	| token名称（同时也是cookie名称）													|
-| timeout		| long		| 2592000	| token有效期，单位s 默认30天														|
-| isShare		| Boolean	| true		|  在多人登录同一账号时，是否共享会话（为true时共用一个，为false时新登录挤掉旧登录）|
-| isReadBody	| Boolean	| true		| 是否尝试从请求体里读取token														|
-| isReadHead	| Boolean	| true		| 是否尝试从header里读取token														|
-| isReadCookie	| Boolean	| true		| 是否尝试从cookie里读取token														|
-| tokenStyle	| String	| uuid		| token风格, 参考：[花式token](/use/token-style)										|
-| isV			| Boolean	| true		| 是否在初始化配置时打印版本字符画													|




-
-### 方式1、通过代码配置
-``` java 
-	/**
-	 * sa-token代码方式进行配置
-	 */
-	@Configuration
-	public class MySaTokenConfig {
-	
-		// 获取配置Bean (以代码的方式配置sa-token)
-		@Primary
-		@Bean(name="MySaTokenConfig")
-		public SaTokenConfig getSaTokenConfig() {
-			SaTokenConfig config = new SaTokenConfig();
-			config.setTokenName("satoken");		// token名称 (同时也是cookie名称)
-			config.setTimeout(30 * 24 * 60 * 60); 	// token有效期，单位s 默认30天
-			config.setIsShare(true);				// 在多人登录同一账号时，是否共享会话 (为true时共用一个，为false时新登录挤掉旧登录)
-			config.setIsReadBody(true);		// 是否尝试从请求体里读取token
-			config.setIsReadHead(true);		// 是否尝试从header里读取token
-			config.setIsReadCookie(true);		// 是否尝试从cookie里读取token
-			config.setTokenStyle("uuid"); 		// token风格 
-			config.setIsV(true);					// 是否在初始化配置时打印版本字符画
-			return config;
-		}
-		
-	}
-```
-
-### 方式2、在`application.yml`配置
+### 方式1、在`application.yml`配置

 ``` java
 spring: 
@@ -54,8 +14,10 @@ spring:
    sa-token: 
        # token名称 (同时也是cookie名称)
        token-name: satoken
-        # token有效期，单位s 默认30天
+        # token有效期，单位s 默认30天, -1代表永不过期 
        timeout: 2592000
+		# token临时有效期, 默认-1 代表不限制	
+		activity-timeout: -1
        # 在多人登录同一账号时，是否共享会话 (为true时共用一个，为false时新登录挤掉旧登录)
        is-share: true
        # 是否尝试从请求体里读取token
@@ -74,3 +36,45 @@ spring:
 - 百度： [springboot properties与yml 配置文件的区别](https://www.baidu.com/s?ie=UTF-8&wd=springboot%20properties%E4%B8%8Eyml%20%E9%85%8D%E7%BD%AE%E6%96%87%E4%BB%B6%E7%9A%84%E5%8C%BA%E5%88%AB)


+### 方式2、通过代码配置
+``` java 
+	/**
+	 * sa-token代码方式进行配置
+	 */
+	@Configuration
+	public class MySaTokenConfig {
+	
+		// 获取配置Bean (以代码的方式配置sa-token)
+		@Primary
+		@Bean(name="MySaTokenConfig")
+		public SaTokenConfig getSaTokenConfig() {
+			SaTokenConfig config = new SaTokenConfig();
+			config.setTokenName("satoken");			// token名称 (同时也是cookie名称)
+			config.setTimeout(30 * 24 * 60 * 60); 	// token有效期，单位s 默认30天, -1代表永不过期 
+			config.setActivityTimeout(-1); 			//  token临时有效期, 默认-1 代表不限制	
+			config.setIsShare(true);				// 在多人登录同一账号时，是否共享会话 (为true时共用一个，为false时新登录挤掉旧登录)
+			config.setIsReadBody(true);				// 是否尝试从请求体里读取token
+			config.setIsReadHead(true);				// 是否尝试从header里读取token
+			config.setIsReadCookie(true);			// 是否尝试从cookie里读取token
+			config.setTokenStyle("uuid"); 			// token风格 
+			config.setIsV(true);					// 是否在初始化配置时打印版本字符画
+			return config;
+		}
+		
+	}
+```
+
+
+--- 
+### 所有可配置项
+| 参数名称			| 类型		| 默认值		| 说明																				|
+| :--------			| :--------	| :--------	| :--------																			|
+| tokenName			| String	| satoken	| token名称（同时也是cookie名称）													|
+| timeout			| long		| 2592000	| token有效期，单位/秒 默认30天，-1代表永久有效	[参考：token有效期详解](/fun/token-timeout)		|
+| activityTimeout	| long		| -1		| token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒, 默认-1 代表不限制 (例如可以设置为1800代表30分钟内无操作就过期) 	[参考：token有效期详解](/fun/token-timeout)													|
+| isShare			| Boolean	| true		|  在多人登录同一账号时，是否共享会话（为true时共用一个，为false时新登录挤掉旧登录）	|
+| isReadBody		| Boolean	| true		| 是否尝试从请求体里读取token														|
+| isReadHead		| Boolean	| true		| 是否尝试从header里读取token														|
+| isReadCookie		| Boolean	| true		| 是否尝试从cookie里读取token														|
+| tokenStyle		| String	| uuid		| token风格, [参考：花式token](/use/token-style)										|
+| isV				| Boolean	| true		| 是否在初始化配置时打印版本字符画													|
@@ -1,7 +1,6 @@
 # 持久层扩展
 --- 
- 每次重启项目就得重新登录一遍，我想把登录数据都放在`redis`里，这样重启项目也不用重新登录，行不行？
- 行！
+- 每次重启项目就得重新登录一遍，我想把登录数据都放在`redis`里，这样重启项目也不用重新登录，行不行？**行！**
 - 你需要做的就是重写`sa-token`的dao层实现方式，参考以下方案：


@@ -22,7 +21,6 @@
 - 代码参考：
 	
 ```java
-
 package com.pj.satoken;

 import java.util.concurrent.TimeUnit;
@@ -68,56 +66,78 @@ public class SaTokenDaoRedis implements SaTokenDao {
 	// 写入指定key-value键值对，并设定过期时间(单位：秒)
 	@Override
 	public void setValue(String key, String value, long timeout) {
-		stringRedisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
+		// 判断是否为永不过期 
+		if(timeout == SaTokenDao.NEVER_EXPIRE) {
+			stringRedisTemplate.opsForValue().set(key, value);
+		} else {
+			stringRedisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
+		}
 	}

 	// 更新指定key-value键值对 (过期时间取原来的值)
 	@Override
 	public void updateValue(String key, String value) {
-		long expire = redisTemplate.getExpire(key);
-		if(expire == -2) {	// -2 = 无此键 
+		long expire = getTimeout(key);
+		if(expire == SaTokenDao.NOT_VALUE_EXPIRE) {	// -2 = 无此键 
 			return;
 		}
-		stringRedisTemplate.opsForValue().set(key, value, expire, TimeUnit.SECONDS);
+		this.setValue(key, value, expire);
 	}
 	
 	// 删除一个指定的key 
 	@Override
-	public void delKey(String key) {
+	public void deleteKey(String key) {
 		stringRedisTemplate.delete(key);
 	}

+	// 获取指定key的剩余存活时间 (单位: 秒)
+	@Override
+	public long getTimeout(String key) {
+		return stringRedisTemplate.getExpire(key);
+	}
+	
+	
 	
 	// 根据指定key的session，如果没有，则返回空 
 	@Override
-	public SaSession getSaSession(String sessionId) {
+	public SaSession getSession(String sessionId) {
 		return redisTemplate.opsForValue().get(sessionId);
 	}

 	// 将指定session持久化 
 	@Override
-	public void saveSaSession(SaSession session, long timeout) {
-		redisTemplate.opsForValue().set(session.getId(), session, timeout, TimeUnit.SECONDS);
+	public void saveSession(SaSession session, long timeout) {
+		// 判断是否为永不过期 
+		if(timeout == SaTokenDao.NEVER_EXPIRE) {
+			redisTemplate.opsForValue().set(session.getId(), session);
+		} else {
+			redisTemplate.opsForValue().set(session.getId(), session, timeout, TimeUnit.SECONDS);
+		}
 	}

 	// 更新指定session 
 	@Override
-	public void updateSaSession(SaSession session) {
-		long expire = redisTemplate.getExpire(session.getId());
-		if(expire == -2) {	// -2 = 无此键 
+	public void updateSession(SaSession session) {
+		long expire = getSessionTimeout(session.getId());
+		if(expire == SaTokenDao.NOT_VALUE_EXPIRE) {	// -2 = 无此键 
 			return;
 		}
-		redisTemplate.opsForValue().set(session.getId(), session, expire, TimeUnit.SECONDS);
+		this.saveSession(session, expire);
 	}

 	// 删除一个指定的session 
 	@Override
-	public void deleteSaSession(String sessionId) {
+	public void deleteSession(String sessionId) {
 		redisTemplate.delete(sessionId);
 	}

-}
+	// 获取指定SaSession的剩余存活时间 (单位: 秒)
+	@Override
+	public long getSessionTimeout(String sessionId) {
+		return redisTemplate.getExpire(sessionId);
+	}

+}

 ```

@@ -1,7 +1,7 @@
 # 无cookie模式
 --- 

-## 何为无cookie
+### 何为无cookie

 - 常规PC端鉴权方法，一般由`cookie`进行
 - 而`cookie`有两个特性：1、可由后端控制写入，2、每次请求自动提交
@@ -12,14 +12,14 @@
 	- 每次请求不能自动提交了，那就手动提交（难点在前端如何**将token传递到后端**，同时后端**将其读取出来**）


-## 将token传递到前端
+### 将token传递到前端

 1. 首先调用 `StpUtil.setLoginId(Object loginId)` 进行登录 
 2. 调用 `StpUtil.getTokenInfo()` 返回当前会话的token值 
-	- 此方法返回一个Map，有两个key：`tokenName`和`tokenValue`（`token`的名称和`token`的值）
-	- 将此Map传递到前台，让前端人员将这两个值保存到本地
+	- 此方法返回一个对象，其有两个关键属性：`tokenName`和`tokenValue`（`token`的名称和`token`的值）
+	- 将此对象传递到前台，让前端人员将这两个值保存到本地

-## 前端将token提交到后端
+### 前端将token提交到后端
 1. 无论是app还是小程序，其传递方式都大同小异
 2. 那就是，将`token`塞到请求`header`里 ，格式为：`{tokenName: tokenValue}`
 3. 以经典跨端框架`uni-app`为例： 
@@ -76,7 +76,7 @@
 	- 你当然不能每个`ajax`都写这么一坨，因为这种重复代码都是要封装在一个函数里统一调用的 


-## 其它解决方案？
+### 其它解决方案？
 - 如果你对`cookie`非常了解，那你就会明白，所谓`cookie`，本质上就是一个特殊的`header`参数而已，
 - 而既然它只是一个`header`参数，我们就能就能手动模拟实现它，从而完成鉴权操作
 - 这其实是对无`cookie`模式的另一种解决方案，有兴趣的同学可以百度了解一下，在此暂不赘述 
@@ -67,7 +67,7 @@ footer a:hover{text-decoration: underline;}
 }

 /* 闪光背景 */
-.main-box{
+.z-div{
    background-size: 500%;
 	background-image: linear-gradient(125deg,#BFFEBE,#F6F8B5,#FCD0B3,#BFB6F8,#E8D8B3);
 	animation: bganimation 15s infinite;
@@ -7,14 +7,14 @@
 		<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会话、踢人下线、持久层扩展、无cookie模式、模拟他人账号、多账号体系、注解式鉴权、花式token、Spring集成...，零配置开箱即用，覆盖所有应用场景，你所需要的功能，这里都有">
+		<meta name="description" content="sa-token是一个JavaWeb权限认证框架，强大、简单、好用，登录验证、权限验证、自定义session会话、踢人下线、持久层扩展、无cookie模式、模拟他人账号、多账号体系、注解式鉴权、花式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">
 		
 	</head>
 	<body>
-		<div style="height: 100vh; overflow: auto;">
+		<div class="z-div" style="height: 100vh; overflow: auto;">
 			<header>
 				<a href="/" style="text-decoration: none;">
 					<div class="logo-box">
@@ -43,10 +43,10 @@
 			<!-- 内容部分 -->
 			<div class="main-box">
 				<div class="content-box">
-					<h1>sa-token<small>v1.6.0</small></h1>
+					<h1>sa-token<small>v1.7.0</small></h1>
 					<div class="sub-title">一个JavaWeb轻量级权限认证框架，功能全面，上手简单</div>
 					<!-- <p>0配置开箱即用，低学习成本</p> -->
-					<p>登录验证、权限验证、自定义session会话、踢人下线、持久层扩展、无cookie模式、模拟他人账号、多账号体系、注解式鉴权、花式token、Spring集成...</p>
+					<p>登录验证、权限验证、自定义session会话、踢人下线、持久层扩展、无cookie模式、模拟他人账号、多账号体系、注解式鉴权、花式token、自动续签、Spring集成...</p>
 					<p>零配置开箱即用，覆盖所有应用场景，你所需要的功能，这里都有</p>
 					<div class="btn-box">
 						<a href="https://github.com/click33/sa-token" target="_blank">GitHub</a>
@@ -0,0 +1,12 @@
+target/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+.classpath
+.project
+
+.factorypath
+
+.idea/
@@ -1,41 +1,39 @@
+<?xml version='1.0' encoding='utf-8'?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
-	<!-- 基础信息 -->
-	<groupId>cn.dev33</groupId>
-	<artifactId>sa-token-dev</artifactId>
-    <packaging>jar</packaging>
-    <version>1.6.0</version>
-	
-	<!-- SpringBoot -->
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.RELEASE</version>
-	</parent>
+        <groupId>cn.dev33</groupId>
+        <artifactId>sa-token-parent</artifactId>
+        <version>1.7.0</version>
+    </parent>
+    <packaging>jar</packaging>
+
+	<name>sa-token-spring-boot-starter</name>
+    <artifactId>sa-token-spring-boot-starter</artifactId>
+	<description>springboot integrate sa-token</description>

 	<dependencies>
-
-		<!-- springboot依赖 -->
+		<dependency>
+			<groupId>cn.dev33</groupId>
+			<artifactId>sa-token-core</artifactId>
+			<version>1.7.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<version>2.0.0.RELEASE</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
-		</dependency>
-
-		<!-- @ConfigurationProperties -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
+			<version>2.0.0.RELEASE</version>
 			<optional>true</optional>
 		</dependency>
-		
 	</dependencies>
-	
-	
-</project>
+
+
+
+</project>
@@ -1,4 +1,4 @@
-package cn.dev33.satoken.spring;
+package cn.dev33.satoken.autowired;

 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Import;
@Target({java.lang.annotation.ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Configuration
-@Import({SpringSaToken.class})
+@Import({SaTokenSpringAutowired.class})
 public @interface SaTokenSetup {
 	
 }
@@ -0,0 +1,100 @@
+package cn.dev33.satoken.autowired;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import cn.dev33.satoken.SaTokenManager;
+import cn.dev33.satoken.action.SaTokenAction;
+import cn.dev33.satoken.config.SaTokenConfig;
+import cn.dev33.satoken.cookie.SaTokenCookie;
+import cn.dev33.satoken.dao.SaTokenDao;
+import cn.dev33.satoken.servlet.SaTokenServlet;
+import cn.dev33.satoken.spring.SaTokenServletSpringImpl;
+import cn.dev33.satoken.stp.StpInterface;
+
+/**
+ * 利用spring的自动装配来加载开发者重写的Bean 
+ * @author kong
+ *
+ */
+@Component
+public class SaTokenSpringAutowired {
+
+	
+	/**
+	 * 获取配置Bean 
+	 * @return 配置对象 
+	 */
+	@Bean
+	@ConfigurationProperties(prefix="spring.sa-token")
+	public SaTokenConfig getSaTokenConfig() {
+		return new SaTokenConfig();
+	}
+	
+	/**
+	 * 注入配置Bean 
+	 * @param saTokenConfig 配置对象
+	 */
+	@Autowired
+	public void setConfig(SaTokenConfig saTokenConfig){
+		SaTokenManager.setConfig(saTokenConfig);
+	}
+
+	/**
+	 * 注入持久化Bean 
+	 * @param saTokenDao .
+	 */
+	@Autowired(required = false)
+	public void setSaTokenDao(SaTokenDao saTokenDao){
+		SaTokenManager.setSaTokenDao(saTokenDao);
+	}
+
+	/**
+	 * 注入权限认证Bean 
+	 * @param stpInterface .
+	 */
+	@Autowired(required = false)
+	public void setStpInterface(StpInterface stpInterface){
+		SaTokenManager.setStpInterface(stpInterface);
+	}
+
+	/**
+	 * 注入Cookie操作Bean 
+	 * @param saTokenCookie .
+	 */
+	@Autowired(required = false)
+	public void setSaTokenCookie(SaTokenCookie saTokenCookie){
+		SaTokenManager.setSaTokenCookie(saTokenCookie);
+	}
+
+	/**
+	 * 注入框架行为Bean 
+	 * @param saTokenAction .
+	 */
+	@Autowired(required = false)
+	public void setSaTokenAction(SaTokenAction saTokenAction){
+		SaTokenManager.setSaTokenAction(saTokenAction);
+	}
+
+	/**
+	 * 获取Servlet操作Bean (Spring版) 
+	 * @return Servlet操作Bean (Spring版) 
+	 */
+	@Bean
+	public SaTokenServlet getSaTokenServlet() {
+		return new SaTokenServletSpringImpl();
+	}
+	
+	/**
+	 * 注入Servlet操作Bean 
+	 * @param saTokenServlet .
+	 */
+	@Autowired
+	public void setSaTokenServlet(SaTokenServlet saTokenServlet){
+		SaTokenManager.setSaTokenServlet(saTokenServlet);
+	}
+	
+	
+}
@@ -1,4 +1,4 @@
-package cn.dev33.satoken.annotation;
+package cn.dev33.satoken.interceptor;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;

+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;

@@ -0,0 +1,4 @@
+/**
+ * sa-token集成SpringBoot的各个组件 
+ */
+package cn.dev33.satoken;
@@ -0,0 +1,32 @@
+package cn.dev33.satoken.spring;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.dev33.satoken.servlet.SaTokenServlet;
+
+/**
+ * sa-token 对cookie的相关操作 接口实现类 
+ * @author kong
+ *
+ */
+public class SaTokenServletSpringImpl implements SaTokenServlet {
+
+	/**
+	 * 获取当前请求的Request对象 
+	 */
+	@Override
+	public HttpServletRequest getRequest() {
+		return SpringMVCUtil.getRequest();
+	}
+
+
+	/**
+	 * 获取当前请求的Response对象 
+	 */
+	@Override
+	public HttpServletResponse getResponse() {
+		return SpringMVCUtil.getResponse();
+	}
+	
+}
@@ -1,4 +1,4 @@
-package cn.dev33.satoken.util;
+package cn.dev33.satoken.spring;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -11,11 +11,11 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 * @author kong
 *
 */
-public class SpringMvcUtil {
+public class SpringMVCUtil {
 	
 	/**
 	 * 获取当前会话的 request 
-	 * @return
+	 * @return .
 	 */
 	public static HttpServletRequest getRequest() {
 		ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();// 大善人SpringMVC提供的封装 
@@ -27,7 +27,7 @@ public class SpringMvcUtil {
 	
 	/**
 	 * 获取当前会话的  response
-	 * @return
+	 * @return .
 	 */
 	public static HttpServletResponse getResponse() {
 		ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();// 大善人SpringMVC提供的封装 
@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.dev33.satoken.autowired.SaTokenSpringAutowired
@@ -0,0 +1,12 @@
+target/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+.classpath
+.project
+
+.factorypath
+
+.idea/
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='utf-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+        <groupId>cn.dev33</groupId>
+        <artifactId>sa-token-parent</artifactId>
+        <version>1.7.0</version>
+    </parent>
+    <packaging>jar</packaging>
+
+	<name>sa-token-core</name>
+    <artifactId>sa-token-core</artifactId>
+	<description>A Java Web lightweight authority authentication framework, comprehensive function, easy to use</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+	</dependencies>
+
+
+
+</project>
@@ -0,0 +1,149 @@
+package cn.dev33.satoken;
+
+import cn.dev33.satoken.action.SaTokenAction;
+import cn.dev33.satoken.action.SaTokenActionDefaultImpl;
+import cn.dev33.satoken.config.SaTokenConfig;
+import cn.dev33.satoken.config.SaTokenConfigFactory;
+import cn.dev33.satoken.cookie.SaTokenCookie;
+import cn.dev33.satoken.cookie.SaTokenCookieDefaultImpl;
+import cn.dev33.satoken.dao.SaTokenDao;
+import cn.dev33.satoken.dao.SaTokenDaoDefaultImpl;
+import cn.dev33.satoken.servlet.SaTokenServlet;
+import cn.dev33.satoken.servlet.SaTokenServletDefaultImpl;
+import cn.dev33.satoken.stp.StpInterface;
+import cn.dev33.satoken.stp.StpInterfaceDefaultImpl;
+import cn.dev33.satoken.util.SaTokenInsideUtil;
+
+/**
+ * 管理sa-token所有对象 
+ * @author kong
+ *
+ */
+public class SaTokenManager {
+
+	
+	/**
+	 * 配置文件 Bean 
+	 */
+	private static SaTokenConfig config;	
+	public static SaTokenConfig getConfig() {
+		if (config == null) {
+			initConfig();
+		}
+		return config;
+	}
+	public static void setConfig(SaTokenConfig config) {
+		SaTokenManager.config = config;
+		if(config.getIsV()) {
+			SaTokenInsideUtil.printSaToken();
+		}
+	}
+	public synchronized static void initConfig() {
+		if (config == null) {
+			setConfig(SaTokenConfigFactory.createConfig());
+		}
+	}
+	
+	/**
+	 * 持久化 Bean 
+	 */
+	public static SaTokenDao saTokenDao;
+	public static SaTokenDao getSaTokenDao() {
+		if (saTokenDao == null) {
+			initSaTokenDao();
+		}
+		return saTokenDao;
+	}
+	public static void setSaTokenDao(SaTokenDao saTokenDao) {
+		SaTokenManager.saTokenDao = saTokenDao;
+	}
+	public synchronized static void initSaTokenDao() {
+		if (saTokenDao == null) {
+			setSaTokenDao(new SaTokenDaoDefaultImpl());
+		}
+	}
+	
+	/**
+	 * 权限认证 Bean 
+	 */
+	public static StpInterface stpInterface;
+	public static StpInterface getStpInterface() {
+		if (stpInterface == null) {
+			initStpInterface();
+		}
+		return stpInterface;
+	}
+	public static void setStpInterface(StpInterface stpInterface) {
+		SaTokenManager.stpInterface = stpInterface;
+	}
+	public synchronized static void initStpInterface() {
+		if (stpInterface == null) {
+			setStpInterface(new StpInterfaceDefaultImpl());
+		}
+	}
+	
+	/**
+	 * 框架行为 Bean 
+	 */
+	public static SaTokenAction saTokenAction;
+	public static SaTokenAction getSaTokenAction() {
+		if (saTokenAction == null) {
+			initSaTokenAction();
+		}
+		return saTokenAction;
+	}
+	public static void setSaTokenAction(SaTokenAction saTokenAction) {
+		SaTokenManager.saTokenAction = saTokenAction;
+	}
+	public synchronized static void initSaTokenAction() {
+		if (saTokenAction == null) {
+			setSaTokenAction(new SaTokenActionDefaultImpl());
+		}
+	}
+
+	/**
+	 * Cookie操作 Bean 
+	 */
+	public static SaTokenCookie saTokenCookie;
+	public static SaTokenCookie getSaTokenCookie() {
+		if (saTokenCookie == null) {
+			initSaTokenCookie();
+		}
+		return saTokenCookie;
+	}
+	public static void setSaTokenCookie(SaTokenCookie saTokenCookie) {
+		SaTokenManager.saTokenCookie = saTokenCookie;
+	}
+	public synchronized static void initSaTokenCookie() {
+		if (saTokenCookie == null) {
+			setSaTokenCookie(new SaTokenCookieDefaultImpl());
+		}
+	}
+	
+	/**
+	 * Servlet操作 Bean 
+	 */
+	public static SaTokenServlet saTokenServlet;
+	public static SaTokenServlet getSaTokenServlet() {
+		if (saTokenServlet == null) {
+			initSaTokenServlet();
+		}
+		return saTokenServlet;
+	}
+	public static void setSaTokenServlet(SaTokenServlet saTokenServlet) {
+		SaTokenManager.saTokenServlet = saTokenServlet;
+	}
+	public synchronized static void initSaTokenServlet() {
+		if (saTokenServlet == null) {
+			setSaTokenServlet(new SaTokenServletDefaultImpl());
+		}
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+}
@@ -0,0 +1,15 @@
+package cn.dev33.satoken.action;
+
+public interface SaTokenAction {
+
+	
+	/**
+	 * 生成一个token 
+	 * @param loginId 账号id
+	 * @param loginKey 登录标识key 
+	 * @return 一个token
+	 */
+	public String createToken(Object loginId, String loginKey); 
+	
+	
+}
@@ -2,12 +2,8 @@ package cn.dev33.satoken.action;

 import java.util.UUID;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.dev33.satoken.SaTokenManager;
 import cn.dev33.satoken.util.SaTokenInsideUtil;
-import cn.dev33.satoken.util.SpringMvcUtil;

 /**
 * 对 SaTokenAction 接口的默认实现 
@@ -16,23 +12,6 @@ import cn.dev33.satoken.util.SpringMvcUtil;
 */
 public class SaTokenActionDefaultImpl implements SaTokenAction {

-	/**
-	 * 获取当前请求的Request对象 
-	 */
-	@Override
-	public HttpServletRequest getCurrRequest() {
-		return SpringMvcUtil.getRequest();
-	}
-
-
-	/**
-	 * 获取当前请求的Response对象 
-	 */
-	@Override
-	public HttpServletResponse getResponse() {
-		return SpringMvcUtil.getResponse();
-	}
-	
 	
 	/**
 	 * 生成一个token 
@@ -9,6 +9,7 @@ public class SaTokenConfig {

 	private String tokenName = "satoken";		// token名称 (同时也是cookie名称)
 	private long timeout = 30 * 24 * 60 * 60;	// token有效期，单位s 默认30天
+	private long activityTimeout = -1;			// token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒, 默认-1 代表不限制 (例如可以设置为1800代表30分钟内无操作就过期) 
 	private Boolean isShare = true;			// 在多人登录同一账号时，是否共享会话 (为true时共用一个，为false时新登录挤掉旧登录)
 	private Boolean isReadBody = true;			// 是否尝试从请求体里读取token
 	private Boolean isReadHead = true;			// 是否尝试从header里读取token
@@ -47,7 +48,21 @@ public class SaTokenConfig {
 	public void setTimeout(long timeout) {
 		this.timeout = timeout;
 	}
+	
+	/**
+	 * @return activityTimeout
+	 */
+	public long getActivityTimeout() {
+		return activityTimeout;
+	}

+	/**
+	 * @param activityTimeout 要设置的 activityTimeout
+	 */
+	public void setActivityTimeout(long activityTimeout) {
+		this.activityTimeout = activityTimeout;
+	}
+	
 	/**
 	 * @return isShare
 	 */
@@ -137,9 +152,9 @@ public class SaTokenConfig {
 	
 	@Override
 	public String toString() {
-		return "SaTokenConfig [tokenName=" + tokenName + ", timeout=" + timeout + ", isShare=" + isShare
-				+ ", isReadBody=" + isReadBody + ", isReadHead=" + isReadHead + ", isReadCookie=" + isReadCookie
-				+ ", tokenStyle=" + tokenStyle + ", isV=" + isV + "]";
+		return "SaTokenConfig [tokenName=" + tokenName + ", timeout=" + timeout + ", activityTimeout=" + activityTimeout
+				+ ", isShare=" + isShare + ", isReadBody=" + isReadBody + ", isReadHead=" + isReadHead
+				+ ", isReadCookie=" + isReadCookie + ", tokenStyle=" + tokenStyle + ", isV=" + isV + "]";
 	}

 	
@@ -149,6 +164,10 @@ public class SaTokenConfig {
 	
 	
 	
+
+	
+	
+	
 	
 	
 	
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 * @author kong
 *
 */
-public interface SaCookieOper {
+public interface SaTokenCookie {

 	/**
 	 * 获取指定cookie .
@@ -4,41 +4,39 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-import cn.dev33.satoken.util.SaCookieUtil;
-
 /**
 * sa-token 对cookie的相关操作 接口实现类 
 * @author kong
 *
 */
-public class SaCookieOperDefaultImpl implements SaCookieOper {
+public class SaTokenCookieDefaultImpl implements SaTokenCookie {

 	/**
 	 * 获取指定cookie 
 	 */
 	public Cookie getCookie(HttpServletRequest request, String cookieName) {
-		return SaCookieUtil.getCookie(request, cookieName);
+		return SaTokenCookieUtil.getCookie(request, cookieName);
 	}

 	/**
 	 * 添加cookie 
 	 */
 	public void addCookie(HttpServletResponse response, String name, String value, String path, int timeout) {
-		SaCookieUtil.addCookie(response, name, value, path, timeout);
+		SaTokenCookieUtil.addCookie(response, name, value, path, timeout);
 	}

 	/**
 	 * 删除cookie 
 	 */
 	public void delCookie(HttpServletRequest request, HttpServletResponse response, String name) {
-		SaCookieUtil.delCookie(request, response, name);
+		SaTokenCookieUtil.delCookie(request, response, name);
 	}

 	/**
 	 * 修改cookie的value值 
 	 */
 	public void updateCookie(HttpServletRequest request, HttpServletResponse response, String name, String value) {
-		SaCookieUtil.updateCookie(request, response, name, value);
+		SaTokenCookieUtil.updateCookie(request, response, name, value);
 	}

 }
@@ -1,4 +1,4 @@
-package cn.dev33.satoken.util;
+package cn.dev33.satoken.cookie;

 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 * @author kong
 *
 */
-public class SaCookieUtil {
+public class SaTokenCookieUtil {

 	/**
 	 * 获取指定cookie .
@@ -10,6 +10,14 @@ import cn.dev33.satoken.session.SaSession;
 public interface SaTokenDao {

 	
+	/** 常量，表示一个key永不过期 (在一个key被标注为永远不过期时返回此值) */ 
+	public static final Long NEVER_EXPIRE = -1L;
+	
+	/** 常量，表示系统中不存在这个缓存 (在对不存在的key获取剩余存活时间时返回此值) */ 
+	public static final Long NOT_VALUE_EXPIRE = -2L;
+	
+	
+	
 	/**
 	 * 根据key获取value ，如果没有，则返回空 
 	 * @param key 键名称 
@@ -36,8 +44,14 @@ public interface SaTokenDao {
 	 * 删除一个指定的key 
 	 * @param key 键名称 
 	 */
-	public void delKey(String key);
+	public void deleteKey(String key);
 	
+	/**
+	 * 获取指定key的剩余存活时间 (单位: 秒)
+	 * @param key 指定key 
+	 * @return 这个key的剩余存活时间 
+	 */
+	public long getTimeout(String key);
 	

 	/**
@@ -45,26 +59,36 @@ public interface SaTokenDao {
 	 * @param sessionId 键名称 
 	 * @return SaSession
 	 */
-	public SaSession getSaSession(String sessionId);
+	public SaSession getSession(String sessionId);

 	/**
-	 *  将指定session持久化 
+	 * 将指定session持久化 
 	 * @param session 要保存的session对象
 	 * @param timeout 过期时间，单位: s
 	 */
-	public void saveSaSession(SaSession session, long timeout);
+	public void saveSession(SaSession session, long timeout);

 	/**
 	 * 更新指定session
 	 * @param session 要更新的session对象
 	 */
-	public void updateSaSession(SaSession session);
+	public void updateSession(SaSession session);
 	
 	/**
-	 *   删除一个指定的session 
+	 * 删除一个指定的session 
 	 * @param sessionId sessionId
 	 */
-	public void deleteSaSession(String sessionId);
+	public void deleteSession(String sessionId);
+
+	/**
+	 * 获取指定SaSession的剩余存活时间 (单位: 秒)
+	 * @param sessionId 指定SaSession 
+	 * @return 这个SaSession的剩余存活时间 
+	 */
+	public long getSessionTimeout(String sessionId);
+	
+	
+	
 	
 	
 }
@@ -0,0 +1,140 @@
+package cn.dev33.satoken.dao;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import cn.dev33.satoken.session.SaSession;
+
+/**
+ * sa-token持久层默认的实现类 , 基于内存Map 
+ * @author kong
+ *
+ */
+public class SaTokenDaoDefaultImpl implements SaTokenDao {
+
+	/**
+	 * 所有数据集合 
+	 */
+	public Map<String, Object> dataMap = new HashMap<String, Object>();
+
+	/**
+	 * 过期时间集合 (单位: 毫秒) , 记录所有key的到期时间 [注意不是剩余存活时间]
+	 */
+	public Map<String, Long> expireMap = new HashMap<String, Long>();
+	
+	
+	@Override
+	public String getValue(String key) {
+		clearKeyByTimeout(key);
+		return (String)dataMap.get(key);
+	}
+
+	@Override
+	public void setValue(String key, String value, long timeout) {
+		dataMap.put(key, value);
+		expireMap.put(key, (timeout == SaTokenDao.NEVER_EXPIRE) ? (SaTokenDao.NEVER_EXPIRE) : (System.currentTimeMillis() + timeout * 1000));
+	}
+
+	@Override
+	public void updateValue(String key, String value) {
+		if(getKeyTimeout(key) == SaTokenDao.NOT_VALUE_EXPIRE) {
+			return;
+		}
+		dataMap.put(key, value);
+	}
+
+	@Override
+	public void deleteKey(String key) {
+		dataMap.remove(key);
+		expireMap.remove(key);
+	}
+	
+	@Override
+	public long getTimeout(String key) {
+		return getKeyTimeout(key);
+	}
+	
+	
+	@Override
+	public SaSession getSession(String sessionId) {
+		clearKeyByTimeout(sessionId);
+		return (SaSession)dataMap.get(sessionId);
+	}
+
+	@Override
+	public void saveSession(SaSession session, long timeout) {
+		dataMap.put(session.getId(), session);
+		expireMap.put(session.getId(), (timeout == SaTokenDao.NEVER_EXPIRE) ? (SaTokenDao.NEVER_EXPIRE) : (System.currentTimeMillis() + timeout * 1000));
+	}
+
+	@Override
+	public void updateSession(SaSession session) {
+		if(getKeyTimeout(session.getId()) == SaTokenDao.NOT_VALUE_EXPIRE) {
+			return;
+		}
+		// 无动作 
+	}
+
+	@Override
+	public void deleteSession(String sessionId) {
+		dataMap.remove(sessionId);
+		expireMap.remove(sessionId);
+	}
+	
+	@Override
+	public long getSessionTimeout(String sessionId) {
+		return getKeyTimeout(sessionId);
+	}
+	
+
+
+	// --------------------- 
+
+	/**
+	 * 如果指定key已经过期，则立即清除它 
+	 * @param key 指定key 
+	 */
+	void clearKeyByTimeout(String key) {
+		Long expirationTime = expireMap.get(key);
+		// 清除条件：如果不为空 && 不是[永不过期] && 已经超过过期时间 
+		if(expirationTime != null && expirationTime != SaTokenDao.NEVER_EXPIRE && expirationTime < System.currentTimeMillis()) {
+			dataMap.remove(key);
+			expireMap.remove(key);
+		}
+	}
+
+	
+	/**
+	 * 获取指定key的剩余存活时间 (单位：秒)
+	 */
+	long getKeyTimeout(String key) {
+		// 先检查是否已经过期
+		clearKeyByTimeout(key);
+		// 获取过期时间 
+		Long expire = expireMap.get(key);
+		// 如果根本没有这个值 
+		if(expire == null) {
+			return SaTokenDao.NOT_VALUE_EXPIRE;
+		}
+		// 如果被标注为永不过期 
+		if(expire == SaTokenDao.NEVER_EXPIRE) {
+			return SaTokenDao.NEVER_EXPIRE;
+		}
+		// ---- 计算剩余时间并返回 
+		long timeout = (expire - System.currentTimeMillis()) / 1000;
+		// 小于零时，视为不存在 
+		if(timeout < 0) {
+			dataMap.remove(key);
+			expireMap.remove(key);
+			return SaTokenDao.NOT_VALUE_EXPIRE;
+		}
+		return timeout;
+	}
+	
+	
+	
+	
+	
+	
+	
+}
@@ -0,0 +1,21 @@
+package cn.dev33.satoken.exception;
+
+/**
+ * sa-token框架内部逻辑发生错误抛出的异常 
+ * @author kong
+ *
+ */
+public class SaTokenException extends RuntimeException {
+   
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6806129545290130132L;
+	
+
+	public SaTokenException(String message) {
+		super(message);	
+    }
+
+
+}
@@ -1,16 +1,21 @@
-package cn.dev33.satoken.action;
+package cn.dev33.satoken.servlet;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

-public interface SaTokenAction {
+/**
+ * Servlet相关操作 
+ * @author kong
+ *
+ */
+public interface SaTokenServlet {
+

-	
 	/**
 	 * 获取当前请求的Request对象
 	 * @return 当前请求的Request对象
 	 */
-	public HttpServletRequest getCurrRequest();
+	public HttpServletRequest getRequest();
 	
 	/**
 	 * 获取当前会话的  response
@@ -18,13 +23,5 @@ public interface SaTokenAction {
 	 */
 	public HttpServletResponse getResponse();
 	
-	/**
-	 * 生成一个token 
-	 * @param loginId 账号id
-	 * @param loginKey 登录标识key 
-	 * @return 一个token
-	 */
-	public String createToken(Object loginId, String loginKey); 
-	
 	
 }
@@ -0,0 +1,30 @@
+package cn.dev33.satoken.servlet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * sa-token 对Servlet的相关操作 接口默认实现类 
+ * @author kong
+ *
+ */
+public class SaTokenServletDefaultImpl implements SaTokenServlet {
+
+	/**
+	 * 获取当前请求的Request对象 
+	 */
+	@Override
+	public HttpServletRequest getRequest() {
+		throw new RuntimeException("请实现SaTokenServlet接口后进行Servlet相关操作");
+	}
+
+
+	/**
+	 * 获取当前请求的Response对象 
+	 */
+	@Override
+	public HttpServletResponse getResponse() {
+		throw new RuntimeException("请实现SaTokenServlet接口后进行Servlet相关操作");
+	}
+	
+}
@@ -137,7 +137,7 @@ public class SaSession implements Serializable {
 	 * 将这个session从持久库更新一下  
 	 */
 	public void update() {
-		SaTokenManager.getDao().updateSaSession(this);
+		SaTokenManager.getSaTokenDao().updateSession(this);
 	}

 	
@@ -23,7 +23,7 @@ public class SaSessionCustomUtil {
 	 * @return 是否存在 
 	 */
 	public boolean isExists(String sessionId) {
-		return SaTokenManager.getDao().getSaSession(getSessionKey(sessionId)) != null;
+		return SaTokenManager.getSaTokenDao().getSession(getSessionKey(sessionId)) != null;
 	}
 	
 	/** 
@@ -33,13 +33,14 @@ public class SaSessionCustomUtil {
 	 * @return SaSession
 	 */
 	public static SaSession getSessionById(String sessionId, boolean isCreate) {
-		SaSession session = SaTokenManager.getDao().getSaSession(getSessionKey(sessionId));
+		SaSession session = SaTokenManager.getSaTokenDao().getSession(getSessionKey(sessionId));
 		if(session == null && isCreate) {
 			session = new SaSession(getSessionKey(sessionId));
-			SaTokenManager.getDao().saveSaSession(session, SaTokenManager.getConfig().getTimeout());
+			SaTokenManager.getSaTokenDao().saveSession(session, SaTokenManager.getConfig().getTimeout());
 		}
 		return session;
 	}
+	
 	/** 
 	 * 获取指定key的session, 如果没有则新建并返回  
 	 * @param sessionId key
@@ -54,7 +55,7 @@ public class SaSessionCustomUtil {
 	 * @param sessionId 删除指定key  
 	 */
 	public static void deleteSessionById(String sessionId) {
-		SaTokenManager.getDao().deleteSaSession(getSessionKey(sessionId));
+		SaTokenManager.getSaTokenDao().deleteSession(getSessionKey(sessionId));
 	}
 	
 	
@@ -0,0 +1,187 @@
+package cn.dev33.satoken.stp;
+
+/**
+ * 用来描述一个token常用信息的类 
+ * @author kong
+ *
+ */
+public class SaTokenInfo {
+
+	/** token名称 */
+	public String tokenName;
+
+	/** token值 */
+	public String tokenValue;
+
+	/** 当前是否已经登录 */
+	public Boolean isLogin;
+
+	/** 当前loginId，未登录时为null */
+	public Object loginId;
+
+	/** 当前loginKey */
+	public String loginKey;
+
+	/** token剩余有效期 (单位: 秒) */
+	public long tokenTimeout;
+
+	/** session剩余有效时间 (单位: 秒) */
+	public long sessionTimeout;
+
+	/**
+	 * token剩余无操作有效时间
+	 */
+	public long tokenActivityTimeout;
+	
+
+	/**
+	 * @return tokenName token名称
+	 */
+	public String getTokenName() {
+		return tokenName;
+	}
+
+	/**
+	 * @param tokenName 要设置的 tokenName
+	 * @return 对象自身
+	 */
+	public SaTokenInfo setTokenName(String tokenName) {
+		this.tokenName = tokenName;
+		return this;
+	}
+
+	/**
+	 * @return tokenValue
+	 */
+	public String getTokenValue() {
+		return tokenValue;
+	}
+
+	/**
+	 * @param tokenValue 要设置的 tokenValue
+	 * @return 对象自身
+	 */
+	public SaTokenInfo setTokenValue(String tokenValue) {
+		this.tokenValue = tokenValue;
+		return this;
+	}
+
+	/**
+	 * @return isLogin
+	 */
+	public Boolean getIsLogin() {
+		return isLogin;
+	}
+
+	/**
+	 * @param isLogin 要设置的 isLogin
+	 * @return 对象自身
+	 */
+	public SaTokenInfo setIsLogin(Boolean isLogin) {
+		this.isLogin = isLogin;
+		return this;
+	}
+
+	/**
+	 * @return loginId
+	 */
+	public Object getLoginId() {
+		return loginId;
+	}
+
+	/**
+	 * @param loginId 要设置的 loginId
+	 * @return 对象自身
+	 */
+	public SaTokenInfo setLoginId(Object loginId) {
+		this.loginId = loginId;
+		return this;
+	}
+
+	/**
+	 * @return loginKey
+	 */
+	public String getLoginKey() {
+		return loginKey;
+	}
+
+	/**
+	 * @param loginKey 要设置的 loginKey
+	 * @return 对象自身
+	 */
+	public SaTokenInfo setLoginKey(String loginKey) {
+		this.loginKey = loginKey;
+		return this;
+	}
+	
+	/**
+	 * @return tokenTimeout
+	 */
+	public long getTokenTimeout() {
+		return tokenTimeout;
+	}
+
+	/**
+	 * @param tokenTimeout 要设置的 tokenTimeout
+	 * @return 对象自身
+	 */
+	public SaTokenInfo setTokenTimeout(long tokenTimeout) {
+		this.tokenTimeout = tokenTimeout;
+		return this;
+	}
+
+	/**
+	 * @return sessionTimeout
+	 */
+	public long getSessionTimeout() {
+		return sessionTimeout;
+	}
+
+	/**
+	 * @param sessionTimeout 要设置的 sessionTimeout
+	 * @return 对象自身
+	 */
+	public SaTokenInfo setSessionTimeout(long sessionTimeout) {
+		this.sessionTimeout = sessionTimeout;
+		return this;
+	}
+
+	/**
+	 * @return tokenActivityTimeout
+	 */
+	public long getTokenActivityTimeout() {
+		return tokenActivityTimeout;
+	}
+
+	/**
+	 * @param tokenActivityTimeout 要设置的 tokenActivityTimeout
+	 * @return 对象自身
+	 */
+	public SaTokenInfo setTokenActivityTimeout(long tokenActivityTimeout) {
+		this.tokenActivityTimeout = tokenActivityTimeout;
+		return this;
+	}
+
+	
+	
+	
+	@Override
+	public String toString() {
+		return "SaTokenInfo [tokenName=" + tokenName + ", tokenValue=" + tokenValue + ", isLogin=" + isLogin
+				+ ", loginId=" + loginId + ", loginKey=" + loginKey + ", tokenTimeout=" + tokenTimeout
+				+ ", sessionTimeout=" + sessionTimeout + ", tokenActivityTimeout=" + tokenActivityTimeout + "]";
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+}
@@ -0,0 +1,707 @@
+package cn.dev33.satoken.stp;
+
+import java.util.List;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+
+import cn.dev33.satoken.SaTokenManager;
+import cn.dev33.satoken.config.SaTokenConfig;
+import cn.dev33.satoken.dao.SaTokenDao;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.exception.NotPermissionException;
+import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.util.SaTokenInsideUtil;
+
+/**
+ * sa-token 权限验证，逻辑 实现类 
+ * <p>
+ * (stp = sa-token-permission 的缩写 )
+ * @author kong
+ */
+public class StpLogic {
+
+	/**
+	 * 持久化的key前缀，多账号认证体系时以此值区分，比如：login、user、admin 
+	 */
+	public String loginKey = "";		
+	
+	/**
+	 * 初始化StpLogic, 并制定loginKey
+	 * @param loginKey 账号标识 
+	 */
+	public StpLogic(String loginKey) {
+		this.loginKey = loginKey;
+	}
+
+	
+	// =================== 获取token 相关 ===================  
+	
+	/**
+	 * 返回token名称 
+	 * @return 此StpLogic的token名称
+	 */
+	public String getTokenName() {
+ 		return getKeyTokenName();
+ 	}
+
+	/**
+	 * 随机生成一个tokenValue
+	 * @param loginId loginId
+	 * @return 生成的tokenValue 
+	 */
+ 	public String randomTokenValue(Object loginId) {
+		return SaTokenManager.getSaTokenAction().createToken(loginId, loginKey);
+	}
+	
+	/**
+	 *  获取当前tokenValue
+	 * @return 当前tokenValue
+	 */
+	public String getTokenValue(){
+		// 0. 获取相应对象 
+		HttpServletRequest request = SaTokenManager.getSaTokenServlet().getRequest();
+		SaTokenConfig config = SaTokenManager.getConfig();
+		String keyTokenName = getTokenName();
+		String tokenValue = null;
+		
+		// 1. 尝试从request里读取 
+		if(request.getAttribute(SaTokenInsideUtil.JUST_CREATED_SAVE_KEY) != null) {
+			tokenValue = String.valueOf(request.getAttribute(SaTokenInsideUtil.JUST_CREATED_SAVE_KEY));
+		}
+		// 2. 尝试从请求体里面读取 
+		if(tokenValue == null && config.getIsReadBody() == true){
+			tokenValue = request.getParameter(keyTokenName);
+		}
+		// 3. 尝试从header力读取 
+		if(tokenValue == null && config.getIsReadHead() == true){
+			tokenValue = request.getHeader(keyTokenName);
+		}
+		// 4. 尝试从cookie里读取 
+		if(tokenValue == null && config.getIsReadCookie() == true){
+			Cookie cookie = SaTokenManager.getSaTokenCookie().getCookie(request, keyTokenName);
+			if(cookie != null){
+				tokenValue = cookie.getValue();
+			}
+		}
+		
+		// 5. 返回 
+		return tokenValue;
+	}
+	
+	/** 
+	 * 获取指定loginId的tokenValue
+	 * @param loginId .
+	 * @return .
+	 */
+	public String getTokenValueByLoginId(Object loginId) {
+		return SaTokenManager.getSaTokenDao().getValue(getKeyLoginId(loginId)); 
+	}
+	
+	/**
+	 * 获取当前StpLogin的loginKey
+	 * @return 当前StpLogin的loginKey
+	 */
+	public String getLoginKey(){
+		return loginKey;
+	}
+	
+	/**
+	 * 获取当前会话的token信息 
+	 * @return token信息 
+	 */
+	public SaTokenInfo getTokenInfo() {
+		SaTokenInfo info = new SaTokenInfo();
+		info.tokenName = getTokenName();
+		info.tokenValue = getTokenValue();
+		info.isLogin = isLogin();
+		info.loginId = getLoginIdDefaultNull();
+		info.loginKey = getLoginKey();
+		info.tokenTimeout = getTokenTimeout();
+		info.sessionTimeout = getSessionTimeout();
+		info.tokenActivityTimeout = getTokenActivityTimeout();
+		return info;
+	}
+	
+	
+	// =================== 登录相关操作 ===================  
+
+	/**
+	 * 在当前会话上登录id 
+	 * @param loginId 登录id ，建议的类型：（long | int | String）
+	 */
+	public void setLoginId(Object loginId) {
+		
+		// 1、获取相应对象  
+		HttpServletRequest request = SaTokenManager.getSaTokenServlet().getRequest();
+		SaTokenConfig config = SaTokenManager.getConfig();
+		SaTokenDao dao = SaTokenManager.getSaTokenDao();
+		
+		// 2、获取tokenValue
+		String tokenValue = getTokenValueByLoginId(loginId);	// 获取旧tokenValue
+		if(tokenValue == null){			// 为null则创建一个新的
+			tokenValue = randomTokenValue(loginId);
+		} else {
+			// 不为null, 并且配置不共享会话，则：将原来的会话标记为[被顶替] 
+			if(config.getIsShare() == false){
+				dao.updateValue(getKeyTokenValue(tokenValue), NotLoginException.BE_REPLACED);
+				clearLastActivity(tokenValue); 	// 同时清理掉[最后操作时间] 
+				tokenValue = randomTokenValue(loginId);	// 再重新生成一个token 
+			}
+		}
+
+		// 3、持久化 
+		dao.setValue(getKeyTokenValue(tokenValue), String.valueOf(loginId), config.getTimeout());	// token -> uid 
+		dao.setValue(getKeyLoginId(loginId), tokenValue, config.getTimeout());							// uid -> token 
+		request.setAttribute(SaTokenInsideUtil.JUST_CREATED_SAVE_KEY, tokenValue);								// 保存到本次request里  
+		setLastActivityToNow(tokenValue);  // 写入 [最后操作时间]
+		if(config.getIsReadCookie() == true){
+			SaTokenManager.getSaTokenCookie().addCookie(SaTokenManager.getSaTokenServlet().getResponse(), getTokenName(), tokenValue, "/", (int)config.getTimeout());		// cookie注入 
+		}
+	}
+
+	/** 
+	 * 当前会话注销登录
+	 */
+	public void logout() {
+		// 如果连token都没有，那么无需执行任何操作 
+		String tokenValue = getTokenValue();
+ 		if(tokenValue == null) {
+ 			return;
+ 		}
+ 		// 如果打开了cookie模式，第一步，先把cookie清除掉 
+ 		if(SaTokenManager.getConfig().getIsReadCookie() == true){
+			SaTokenManager.getSaTokenCookie().delCookie(SaTokenManager.getSaTokenServlet().getRequest(), SaTokenManager.getSaTokenServlet().getResponse(), getTokenName()); 	
+		}
+ 		// 尝试从db中获取loginId值 
+ 		String loginId = SaTokenManager.getSaTokenDao().getValue(getKeyTokenValue(tokenValue));
+ 		// 如果根本查不到loginId，那么也无需执行任何操作 
+ 		if(loginId == null) {
+ 			return;
+ 		}
+ 		// 如果已过期或被顶替或被挤下线，那么只删除此token即可 
+ 		if(loginId.equals(NotLoginException.TOKEN_TIMEOUT) || loginId.equals(NotLoginException.BE_REPLACED) || loginId.equals(NotLoginException.KICK_OUT)) {
+ 			return;
+ 		}
+		// 至此，已经是一个正常的loginId，开始三清 
+ 		logoutByLoginId(loginId);
+	}
+
+	/**
+	 * 指定loginId的会话注销登录（正常注销下线）
+	 * @param loginId 账号id 
+	 */
+	public void logoutByLoginId(Object loginId) {
+		
+		// 获取相应tokenValue
+		String tokenValue = getTokenValueByLoginId(loginId);
+		if(tokenValue == null) {
+			return;
+		}
+		
+		// 清除相关数据 
+		SaTokenManager.getSaTokenDao().deleteKey(getKeyTokenValue(tokenValue));	// 清除token-id键值对  
+		SaTokenManager.getSaTokenDao().deleteKey(getKeyLoginId(loginId));		// 清除id-token键值对  
+		SaTokenManager.getSaTokenDao().deleteSession(getKeySession(loginId));		// 清除其session 
+		clearLastActivity(tokenValue); 	// 同时清理掉 [最后操作时间] 
+	}
+
+	/**
+	 * 指定loginId的会话注销登录（踢人下线）
+	 * @param loginId 账号id 
+	 */
+	public void kickoutByLoginId(Object loginId) {
+		
+		// 获取相应tokenValue
+		String tokenValue = getTokenValueByLoginId(loginId);
+		if(tokenValue == null) {
+			return;
+		}
+		
+		// 清除相关数据 
+		SaTokenManager.getSaTokenDao().updateValue(getKeyTokenValue(tokenValue), NotLoginException.KICK_OUT);	// 标记：已被踢下线 
+		SaTokenManager.getSaTokenDao().deleteKey(getKeyLoginId(loginId));		// 清除id-token键值对  
+		SaTokenManager.getSaTokenDao().deleteSession(getKeySession(loginId));		// 清除其session 
+		clearLastActivity(tokenValue); 	 // 同时清理掉 [最后操作时间] 
+	}
+	
+	// 查询相关 
+	
+ 	/** 
+ 	 * 获取当前会话是否已经登录
+ 	 * @return 是否已登录 
+ 	 */
+ 	public boolean isLogin() {
+ 		// 判断条件：不为null，并且不在异常项集合里 
+ 		return getLoginIdDefaultNull() != null;
+ 	}
+ 	
+ 	/** 
+ 	 * 检验当前会话是否已经登录，如未登录，则抛出异常
+ 	 */
+ 	public void checkLogin() {
+ 		getLoginId();
+ 	}
+ 	
+ 	/** 
+ 	 * 获取当前会话登录id, 如果未登录，则抛出异常
+ 	 * @return .
+ 	 */
+ 	public Object getLoginId() {
+ 		// 如果获取不到token，则抛出：无token
+ 		String tokenValue = getTokenValue();
+ 		if(tokenValue == null) {
+ 			throw NotLoginException.newInstance(loginKey, NotLoginException.NOT_TOKEN);
+ 		}
+ 		// 查找此token对应loginId, 则抛出：无效token 
+ 		String loginId = SaTokenManager.getSaTokenDao().getValue(getKeyTokenValue(tokenValue));
+ 		if(loginId == null) {
+ 			throw NotLoginException.newInstance(loginKey, NotLoginException.INVALID_TOKEN);
+ 		}
+ 		// 如果是已经过期，则抛出已经过期 
+ 		if(loginId.equals(NotLoginException.TOKEN_TIMEOUT)) {
+ 			throw NotLoginException.newInstance(loginKey, NotLoginException.TOKEN_TIMEOUT);
+ 		}
+ 		// 如果是已经被顶替下去了, 则抛出：已被顶下线 
+ 		if(loginId.equals(NotLoginException.BE_REPLACED)) {
+ 			throw NotLoginException.newInstance(loginKey, NotLoginException.BE_REPLACED);
+ 		}
+ 		// 如果是已经被踢下线了, 则抛出：已被踢下线
+ 		if(loginId.equals(NotLoginException.KICK_OUT)) {
+ 			throw NotLoginException.newInstance(loginKey, NotLoginException.KICK_OUT);
+ 		}
+ 		// 检查是否已经 [临时过期]，同时更新[最后操作时间] 
+ 		checkActivityTimeout(tokenValue);
+ 		updateLastActivityToNow(tokenValue);
+ 		// 至此，返回loginId
+ 		return loginId;
+ 	}
+	
+	/** 
+	 * 获取当前会话登录id, 如果未登录，则返回默认值
+	 * @param <T> 返回类型 
+	 * @param defaultValue 默认值
+	 * @return 登录id 
+	 */
+ 	@SuppressWarnings("unchecked")
+	public <T>T getLoginId(T defaultValue) {
+		Object loginId = getLoginIdDefaultNull();
+		// 如果loginId为null，则返回默认值 
+		if(loginId == null) {
+			return defaultValue;
+		}
+		// 开始尝试类型转换，只尝试三种类型：int、long、String 
+		if(defaultValue instanceof Integer) {
+			return (T)Integer.valueOf(loginId.toString());
+		}
+		if(defaultValue instanceof Long) {
+			return (T)Long.valueOf(loginId.toString());
+		}
+		if(defaultValue instanceof String) {
+			return (T)loginId.toString();
+		}
+		return (T)loginId;
+ 	}
+ 	
+	/** 
+	 * 获取当前会话登录id, 如果未登录，则返回null
+	 * @return .
+	 */
+	public Object getLoginIdDefaultNull() {
+		// 如果连token都是空的，则直接返回 
+		String tokenValue = getTokenValue();
+ 		if(tokenValue == null) {
+ 			return null;
+ 		}
+ 		// loginId为null或者在异常项里面，均视为未登录
+ 		Object loginId = SaTokenManager.getSaTokenDao().getValue(getKeyTokenValue(tokenValue));
+ 		if(loginId == null || NotLoginException.ABNORMAL_LIST.contains(loginId)) {
+ 			return null;
+ 		}
+ 		// 如果已经[临时过期] 
+ 		if(getTokenActivityTimeoutByToken(tokenValue) == SaTokenDao.NOT_VALUE_EXPIRE) {
+ 			return null;
+ 		}
+ 		// 执行到此，证明loginId已经是个正常的账号id了 
+ 		return loginId;
+ 	}
+
+	/** 
+	 * 获取当前会话登录id, 并转换为String
+	 * @return 登录id
+	 */
+ 	public String getLoginIdAsString() {
+ 		return String.valueOf(getLoginId());
+ 	}
+
+	/** 
+	 * 获取当前会话登录id, 并转换为int
+	 * @return 登录id
+	 */
+ 	public int getLoginIdAsInt() {
+ 		// Object loginId = getLoginId();
+// 		if(loginId instanceof Integer) {
+// 			return (Integer)loginId;
+// 		}
+ 		return Integer.valueOf(String.valueOf(getLoginId()));
+ 	}
+
+	/**
+	 * 获取当前会话登录id, 并转换为long
+	 * @return 登录id
+	 */
+ 	public long getLoginIdAsLong() {
+// 		Object loginId = getLoginId();
+// 		if(loginId instanceof Long) {
+// 			return (Long)loginId;
+// 		}
+ 		return Long.valueOf(String.valueOf(getLoginId()));
+ 	}
+ 	
+ 	/** 
+ 	 * 获取指定token对应的登录id，如果未登录，则返回 null 
+ 	 * @param tokenValue token
+ 	 * @return 登录id
+ 	 */
+ 	public Object getLoginIdByToken(String tokenValue) {
+ 		if(tokenValue != null) {
+ 			Object loginId = SaTokenManager.getSaTokenDao().getValue(getKeyTokenValue(tokenValue));
+ 			if(loginId != null) {
+ 				return loginId;
+ 			}
+ 		}
+ 		return null;
+ 	}
+ 	
+ 	
+	// =================== session相关 ===================  
+
+	/** 
+	 * 获取指定key的session, 如果session尚未创建，isCreate=是否新建并返回
+	 * @param sessionId .
+	 * @param isCreate .
+	 * @return .
+	 */
+	protected SaSession getSessionBySessionId(String sessionId, boolean isCreate) {
+		SaSession session = SaTokenManager.getSaTokenDao().getSession(sessionId);
+		if(session == null && isCreate) {
+			session = new SaSession(sessionId);
+			SaTokenManager.getSaTokenDao().saveSession(session, SaTokenManager.getConfig().getTimeout());
+		}
+		return session;
+	}
+
+	/** 
+	 * 获取指定loginId的session, 如果没有，isCreate=是否新建并返回
+	 * @param loginId 登录id
+	 * @param isCreate 是否新建
+	 * @return SaSession
+	 */
+	public SaSession getSessionByLoginId(Object loginId, boolean isCreate) {
+		return getSessionBySessionId(getKeySession(loginId), isCreate);
+	}
+
+	/** 
+	 * 获取指定loginId的session
+	 * @param loginId .
+	 * @return .
+	 */
+	public SaSession getSessionByLoginId(Object loginId) {
+		return getSessionByLoginId(loginId, true);
+	}
+
+	/** 
+	 * 获取当前会话的session, 如果session尚未创建，isCreate=是否新建并返回 
+	 * @param isCreate 是否新建
+	 * @return 当前会话的session 
+	 */
+	public SaSession getSession(boolean isCreate) {
+		return getSessionByLoginId(getLoginId(), isCreate);
+	}
+	
+	/** 
+	 * 获取当前会话的session 
+	 * @return 当前会话的session 
+	 */
+	public SaSession getSession() {
+		return getSession(true);
+	}
+
+ 	
+	// =================== [临时过期] 验证相关 ===================  
+
+ 	/**
+ 	 * 写入指定token的 [最后操作时间] 为当前时间戳 
+ 	 * @param tokenValue 指定token 
+ 	 */
+ 	protected void setLastActivityToNow(String tokenValue) {
+ 		// 如果token == null 或者 设置了[永不过期], 则立即返回 
+ 		if(tokenValue == null || SaTokenManager.getConfig().getActivityTimeout() == SaTokenDao.NEVER_EXPIRE) {
+ 			return;
+ 		}
+ 		// 将[最后操作时间]标记为当前时间戳 
+ 		SaTokenManager.getSaTokenDao().setValue(getKeyLastActivityTime(tokenValue), String.valueOf(System.currentTimeMillis()), SaTokenManager.getConfig().getTimeout());
+ 	}
+ 	
+ 	/**
+ 	 * 清除指定token的 [最后操作时间] 
+ 	 * @param tokenValue 指定token 
+ 	 */
+ 	protected void clearLastActivity(String tokenValue) {
+ 		// 如果token == null 或者 设置了[永不过期], 则立即返回 
+ 		if(tokenValue == null || SaTokenManager.getConfig().getActivityTimeout() == SaTokenDao.NEVER_EXPIRE) {
+ 			return;
+ 		}
+ 		// 删除[最后操作时间]
+ 		SaTokenManager.getSaTokenDao().deleteKey(getKeyLastActivityTime(tokenValue));
+ 		// 清除标记 
+ 		SaTokenManager.getSaTokenServlet().getRequest().removeAttribute(SaTokenInsideUtil.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY);
+ 	}
+ 	
+ 	/**
+ 	 * 检查指定token 是否已经[临时过期]，如果已经过期则抛出异常  
+ 	 * @param tokenValue 指定token
+ 	 */
+ 	public void checkActivityTimeout(String tokenValue) {
+ 		// 如果token == null 或者 设置了[永不过期], 则立即返回 
+ 		if(tokenValue == null || SaTokenManager.getConfig().getActivityTimeout() == SaTokenDao.NEVER_EXPIRE) {
+ 			return;
+ 		}
+ 		// 如果本次请求已经有了[检查标记], 则立即返回 
+ 		HttpServletRequest request = SaTokenManager.getSaTokenServlet().getRequest();
+ 		if(request.getAttribute(SaTokenInsideUtil.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY) != null) {
+ 			return;
+ 		}
+ 		// ------------ 验证是否已经 [临时过期] 
+ 		// 获取 [临时剩余时间]
+ 		long timeout = getTokenActivityTimeoutByToken(tokenValue);
+ 		// -1 代表此token已经被设置永不过期，无须继续验证 
+ 		if(timeout == SaTokenDao.NEVER_EXPIRE) {
+ 			return;
+ 		}
+ 		// -2 代表已过期，抛出异常 
+ 		if(timeout == SaTokenDao.NOT_VALUE_EXPIRE) {
+ 			throw NotLoginException.newInstance(loginKey, NotLoginException.TOKEN_TIMEOUT);
+ 		}
+ 		// --- 至此，验证已通过 
+
+ 		// 打上[检查标记]，标记一下当前请求已经通过验证，避免一次请求多次验证，造成不必要的性能消耗 
+ 		request.setAttribute(SaTokenInsideUtil.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY, true);
+ 	}
+
+ 	/**
+ 	 * 检查当前token 是否已经[临时过期]，如果已经过期则抛出异常  
+ 	 */
+ 	public void checkActivityTimeout() {
+ 		checkActivityTimeout(getTokenValue());
+ 	}
+ 	
+ 	/**
+ 	 * 续签指定token：(将 [最后操作时间] 更新为当前时间戳) 
+ 	 * @param tokenValue 指定token 
+ 	 */
+ 	public void updateLastActivityToNow(String tokenValue) {
+ 		// 如果token == null 或者 设置了[永不过期], 则立即返回 
+ 		if(tokenValue == null || SaTokenManager.getConfig().getActivityTimeout() == SaTokenDao.NEVER_EXPIRE) {
+ 			return;
+ 		}
+ 		SaTokenManager.getSaTokenDao().updateValue(getKeyLastActivityTime(tokenValue), String.valueOf(System.currentTimeMillis()));
+ 	}
+
+ 	/**
+ 	 * 续签当前token：(将 [最后操作时间] 更新为当前时间戳) 
+ 	 * <h1>请注意: 即时token已经 [临时过期] 也可续签成功，
+ 	 * 如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可 </h1>
+ 	 */
+ 	public void updateLastActivityToNow() {
+ 		updateLastActivityToNow(getTokenValue());
+ 	}
+ 	
+ 	
+
+	// =================== 过期时间相关 ===================  
+
+ 	/**
+ 	 * 获取当前登录者的token剩余有效时间 (单位: 秒)
+ 	 * @return token剩余有效时间
+ 	 */
+ 	public long getTokenTimeout() {
+ 		return SaTokenManager.getSaTokenDao().getTimeout(getKeyTokenValue(getTokenValue()));
+ 	}
+ 	
+ 	/**
+ 	 * 获取指定loginId的token剩余有效时间 (单位: 秒) 
+ 	 * @param loginId 指定loginId 
+ 	 * @return token剩余有效时间 
+ 	 */
+ 	public long getTokenTimeoutByLoginId(Object loginId) {
+ 		return SaTokenManager.getSaTokenDao().getTimeout(getKeyTokenValue(getTokenValueByLoginId(loginId)));
+ 	}
+
+ 	/**
+ 	 * 获取当前登录者的Session剩余有效时间 (单位: 秒)
+ 	 * @return token剩余有效时间
+ 	 */
+ 	public long getSessionTimeout() {
+ 		return getSessionTimeoutByLoginId(getLoginIdDefaultNull());
+ 	}
+ 	
+ 	/**
+ 	 * 获取指定loginId的Session剩余有效时间 (单位: 秒) 
+ 	 * @param loginId 指定loginId 
+ 	 * @return token剩余有效时间 
+ 	 */
+ 	public long getSessionTimeoutByLoginId(Object loginId) {
+ 		return SaTokenManager.getSaTokenDao().getSessionTimeout(getKeySession(loginId));
+ 	}
+
+ 	/**
+ 	 * 获取当前token[临时过期]剩余有效时间 (单位: 秒)
+ 	 * @return token[临时过期]剩余有效时间
+ 	 */
+ 	public long getTokenActivityTimeout() {
+ 		return getTokenActivityTimeoutByToken(getTokenValue());
+ 	}
+ 	
+ 	/**
+ 	 * 获取指定token[临时过期]剩余有效时间 (单位: 秒)
+ 	 * @param tokenValue 指定token 
+ 	 * @return token[临时过期]剩余有效时间
+ 	 */
+ 	public long getTokenActivityTimeoutByToken(String tokenValue) {
+ 		// 如果token为null , 则返回 -2
+ 		if(tokenValue == null) {
+ 			return SaTokenDao.NOT_VALUE_EXPIRE;
+ 		}
+ 		// 如果设置了永不过期, 则返回 -1 
+ 		if(SaTokenManager.getConfig().getActivityTimeout() == SaTokenDao.NEVER_EXPIRE) {
+ 			return SaTokenDao.NEVER_EXPIRE;
+ 		}
+ 		// ------ 开始查询 
+ 		// 获取相关数据 
+ 		String keyLastActivityTime = getKeyLastActivityTime(tokenValue);
+ 		String lastActivityTimeString = SaTokenManager.getSaTokenDao().getValue(keyLastActivityTime);
+ 		// 查不到，返回-2 
+ 		if(lastActivityTimeString == null) {
+ 			return SaTokenDao.NOT_VALUE_EXPIRE;
+ 		}
+ 		// 计算相差时间
+ 		long lastActivityTime = Long.valueOf(lastActivityTimeString);
+ 		long apartSecond = (System.currentTimeMillis() - lastActivityTime) / 1000;
+ 		long timeout = SaTokenManager.getConfig().getActivityTimeout() - apartSecond;
+ 		// 如果 < 0， 代表已经过期 ，返回-2 
+ 		if(timeout < 0) {
+ 			return SaTokenDao.NOT_VALUE_EXPIRE;
+ 		}
+ 		return timeout;
+ 	}
+ 	
+
+	// =================== 权限验证操作 ===================  
+
+ 	/** 
+ 	 * 指定loginId是否含有指定权限
+ 	 * @param loginId .
+ 	 * @param pcode .
+ 	 * @return .
+ 	 */
+ 	public boolean hasPermission(Object loginId, Object pcode) {
+ 		List<Object> pcodeList = SaTokenManager.getStpInterface().getPermissionCodeList(loginId, loginKey);
+		return !(pcodeList == null || pcodeList.contains(pcode) == false);
+ 	}
+ 	
+ 	/** 
+ 	 * 当前会话是否含有指定权限
+ 	 * @param pcode .
+ 	 * @return .
+ 	 */
+ 	public boolean hasPermission(Object pcode) {
+ 		return hasPermission(getLoginId(), pcode);
+ 	}
+	
+ 	/** 
+ 	 * 当前账号是否含有指定权限 ， 没有就抛出异常
+ 	 * @param pcode .
+ 	 */
+ 	public void checkPermission(Object pcode) {
+ 		if(hasPermission(pcode) == false) {
+			throw new NotPermissionException(pcode, this.loginKey);
+		}
+ 	}
+
+ 	/** 
+ 	 * 当前账号是否含有指定权限 ， 【指定多个，必须全都有】
+ 	 * @param pcodeArray .
+ 	 */
+ 	public void checkPermissionAnd(Object... pcodeArray){
+ 		Object loginId = getLoginId();
+ 		List<Object> pcodeList = SaTokenManager.getStpInterface().getPermissionCodeList(loginId, loginKey);
+ 		for (Object pcode : pcodeArray) {
+ 			if(pcodeList.contains(pcode) == false) {
+ 				throw new NotPermissionException(pcode, this.loginKey);	// 没有权限抛出异常 
+ 			}
+ 		}
+ 	}
+
+ 	/** 
+ 	 * 当前账号是否含有指定权限 ， 【指定多个，有一个就可以了】
+ 	 * @param pcodeArray .
+ 	 */
+ 	public void checkPermissionOr(Object... pcodeArray){
+ 		Object loginId = getLoginId();
+ 		List<Object> pcodeList = SaTokenManager.getStpInterface().getPermissionCodeList(loginId, loginKey);
+ 		for (Object pcode : pcodeArray) {
+ 			if(pcodeList.contains(pcode) == true) {
+ 				return;		// 有的话提前退出
+ 			}
+ 		}
+		if(pcodeArray.length > 0) {
+	 		throw new NotPermissionException(pcodeArray[0], this.loginKey);	// 没有权限抛出异常 
+		}
+ 	}
+ 	
+	
+	// =================== 返回相应key ===================  
+
+	/**
+	 *  获取key：客户端 tokenName 
+	 * @return key
+	 */
+	public String getKeyTokenName() {
+ 		return SaTokenManager.getConfig().getTokenName();
+ 	}
+	/**  
+	 * 获取key： tokenValue 持久化
+	 * @param tokenValue .
+	 * @return key
+	 */
+	public String getKeyTokenValue(String tokenValue) {
+		return SaTokenManager.getConfig().getTokenName() + ":" + loginKey + ":token:" + tokenValue;
+	}
+	/** 
+	 * 获取key： id 持久化
+	 * @param loginId .
+	 * @return key
+	 */
+	public String getKeyLoginId(Object loginId) {
+		return SaTokenManager.getConfig().getTokenName() + ":" + loginKey + ":id:" + loginId;
+	}
+	/** 
+	 * 获取key： session 持久化  
+	 * @param loginId .
+	 * @return key
+	 */
+	public String getKeySession(Object loginId) {
+		return SaTokenManager.getConfig().getTokenName() + ":" + loginKey + ":session:" + loginId;
+	}
+	/** 
+	 * 获取key： 指定token的最后操作时间 持久化 
+	 * @param tokenValue token
+	 * @return key
+	 */
+	public String getKeyLastActivityTime(String tokenValue) {
+		return SaTokenManager.getConfig().getTokenName() + ":" + loginKey + ":last-activity:" + tokenValue;
+	}
+ 	
+	
+}
@@ -1,16 +1,11 @@
 package cn.dev33.satoken.stp;

-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
 import cn.dev33.satoken.session.SaSession;

 /**
 * 一个默认的实现 
 * @author kong 
 */
-@Service
 public class StpUtil {

 	/**
@@ -38,19 +33,27 @@ public class StpUtil {
 	}

 	/** 
-	 * 获取指定id的tokenValue
+	 * 获取指定loginId的tokenValue 
 	 * @param loginId  .
-	 * @return
+	 * @return .
 	 */
 	public static String getTokenValueByLoginId(Object loginId) {
 		return stpLogic.getTokenValueByLoginId(loginId);
 	}
-
+	
 	/**
-	 * 获取当前会话的token信息：tokenName与tokenValue
-	 * @return 一个Map对象 
+	 * 获取当前StpLogin的loginKey 
+	 * @return 当前StpLogin的loginKey
 	 */
-	public static Map<String, String> getTokenInfo() {
+	public static String getLoginKey(){
+		return stpLogic.getLoginKey();
+	}
+	
+	/**
+	 * 获取当前会话的token信息 
+	 * @return token信息 
+	 */
+	public static SaTokenInfo getTokenInfo() {
 		return stpLogic.getTokenInfo();
 	}

@@ -72,7 +75,7 @@ public class StpUtil {
 	}

 	/**
-	 * 指定loginId的会话注销登录（清退下线）
+	 * 指定loginId的会话注销登录（正常注销下线）
 	 * @param loginId 账号id 
 	 */
 	public static void logoutByLoginId(Object loginId) {
@@ -114,8 +117,9 @@ public class StpUtil {

 	/** 
 	 * 获取当前会话登录id, 如果未登录，则返回默认值
-	 * @param defaultValue .
-	 * @return .
+	 * @param <T> 返回类型 
+	 * @param defaultValue 默认值
+	 * @return 登录id 
 	 */
 	public static <T> T getLoginId(T defaultValue) {
 		return stpLogic.getLoginId(defaultValue);
@@ -123,7 +127,7 @@ public class StpUtil {
 	
 	/** 
 	 * 获取当前会话登录id, 如果未登录，则返回null
-	 * @return
+	 * @return .
 	 */
 	public static Object getLoginIdDefaultNull() {
 		return stpLogic.getLoginIdDefaultNull();
@@ -131,7 +135,7 @@ public class StpUtil {

 	/** 
 	 * 获取当前会话登录id, 并转换为String
-	 * @return
+	 * @return 登录id
 	 */
 	public static String getLoginIdAsString() {
 		return stpLogic.getLoginIdAsString();
@@ -139,7 +143,7 @@ public class StpUtil {

 	/** 
 	 * 获取当前会话登录id, 并转换为int
-	 * @return
+	 * @return 登录id
 	 */
 	public static int getLoginIdAsInt() {
 		return stpLogic.getLoginIdAsInt();
@@ -147,20 +151,22 @@ public class StpUtil {

 	/**
 	 * 获取当前会话登录id, 并转换为long
-	 * @return
+	 * @return 登录id
 	 */
 	public static long getLoginIdAsLong() {
 		return stpLogic.getLoginIdAsLong();
 	}

-	/** 
+ 	/** 
 	 * 获取指定token对应的登录id，如果未登录，则返回 null 
- 	 * @return .
+ 	 * @param tokenValue token
+ 	 * @return 登录id
 	 */
 	public static Object getLoginIdByToken(String tokenValue) {
 		return stpLogic.getLoginIdByToken(tokenValue);
 	}
 	
+ 	
 	// =================== session相关 ===================

 	/** 
@@ -182,14 +188,98 @@ public class StpUtil {
 		return stpLogic.getSessionByLoginId(loginId);
 	}
 	
+	/** 
+	 * 获取当前会话的session, 如果没有，isCreate=是否新建并返回 
+	 * @param isCreate 是否新建
+	 * @return 当前会话的session 
+	 */
+	public static SaSession getSession(boolean isCreate) {
+		return stpLogic.getSession(isCreate);
+	}
+	
 	/** 
 	 * 获取当前会话的session
-	 * @return
+	 * @return .
 	 */
 	public static SaSession getSession() {
 		return stpLogic.getSession();
 	}

+
+	// =================== [临时过期] 验证相关 ===================  
+
+ 	/**
+ 	 * 检查当前token 是否已经[临时过期]，如果已经过期则抛出异常  
+ 	 */
+ 	public static void checkActivityTimeout() {
+ 		stpLogic.checkActivityTimeout();
+ 	}
+
+ 	/**
+ 	 * 续签当前token：(将 [最后操作时间] 更新为当前时间戳) 
+ 	 * <h1>请注意: 即时token已经 [临时过期] 也可续签成功，
+ 	 * 如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可 </h1>
+ 	 */
+ 	public static void updateLastActivityToNow() {
+ 		stpLogic.updateLastActivityToNow();
+ 	}
+ 	
+
+	// =================== 过期时间相关 ===================  
+
+ 	/**
+ 	 * 获取当前登录者的token剩余有效时间 (单位: 秒)
+ 	 * @return token剩余有效时间
+ 	 */
+ 	public static long getTimeout() {
+ 		return stpLogic.getTokenTimeout();
+ 	}
+ 	
+ 	/**
+ 	 * 获取指定loginId的token剩余有效时间 (单位: 秒) 
+ 	 * @param loginId 指定loginId 
+ 	 * @return token剩余有效时间 
+ 	 */
+ 	public static long getTimeoutByLoginId(Object loginId) {
+ 		return stpLogic.getTokenTimeoutByLoginId(loginId);
+ 	}
+
+ 	/**
+ 	 * 获取当前登录者的Session剩余有效时间 (单位: 秒)
+ 	 * @return token剩余有效时间
+ 	 */
+ 	public static long getSessionTimeout() {
+ 		return stpLogic.getSessionTimeout();
+ 	}
+ 	
+ 	/**
+ 	 * 获取指定loginId的Session剩余有效时间 (单位: 秒) 
+ 	 * @param loginId 指定loginId 
+ 	 * @return token剩余有效时间 
+ 	 */
+ 	public static long getSessionTimeoutByLoginId(Object loginId) {
+ 		return stpLogic.getSessionTimeoutByLoginId(loginId);
+ 	}
+ 	
+ 	/**
+ 	 * 获取当前token[临时过期]剩余有效时间 (单位: 秒)
+ 	 * @return token[临时过期]剩余有效时间
+ 	 */
+ 	public static long getTokenActivityTimeout() {
+ 		return stpLogic.getTokenActivityTimeout();
+ 	}
+ 	
+ 	/**
+ 	 * 获取指定token[临时过期]剩余有效时间 (单位: 秒)
+ 	 * @param tokenValue 指定token 
+ 	 * @return token[临时过期]剩余有效时间
+ 	 */
+ 	public static long getTokenActivityTimeoutByToken(String tokenValue) {
+ 		return stpLogic.getTokenActivityTimeoutByToken(tokenValue);
+ 	}
+ 	
+ 	
+	
 	// =================== 权限验证操作 ===================

 	/** 
@@ -13,12 +13,12 @@ public class SaTokenInsideUtil {
 	/**
 	 * sa-token 版本号 
 	 */
-	public static final String VERSION_NO = "v1.6.0";
+	public static final String VERSION_NO = "v1.7.0";

 	/**
 	 * sa-token 开源地址 
 	 */
-	public static final String GITHUB_URL= "https://github.com/click33/sa-token";
+	public static final String GITHUB_URL = "https://github.com/click33/sa-token";
 	
 	/**
 	 * 打印 sa-token
@@ -37,6 +37,11 @@ public class SaTokenInsideUtil {
 	 * 如果token为本次请求新创建的，则以此字符串为key存储在当前request中  JUST_CREATED_SAVE_KEY
 	 */
 	public static final String JUST_CREATED_SAVE_KEY = "JUST_CREATED_SAVE_KEY_"; 	
+
+	/**
+	 * 如果本次请求已经验证过[无操作过期], 则以此值存储在当前request中  TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY
+	 */
+	public static final String TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY = "TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY_"; 	
 	
 	/**
 	 * 生成指定长度的随机字符串
Author	SHA1	Message	Date
shengzhang	9ddc1eb7d0	⚡ 完善示例	2020-12-25 00:21:02 +08:00
shengzhang	34f1e1f2db	⚡ 完善v1.7.0文档	2020-12-25 00:16:12 +08:00
shengzhang	d9836f00ca	⚡ v1.7.0 版本更新	2020-12-24 22:51:57 +08:00
shengzhang	5c684ac7f1	⚡ v1.7.0新特性，token临时过期时间设定	2020-12-24 18:11:12 +08:00
shengzhang	ded6da5554	⚡ v1.7.0 新特性，在Cookie模式下timeout过期时间有效	2020-12-23 18:49:22 +08:00
shengzhang	149b2e54c9	⚡ ADD LICENSE	2020-12-22 01:22:32 +08:00
shengzhang	aad953c6eb	⚡ 重构为maven多模块架构...	2020-12-22 01:14:17 +08:00
shengzhang	4f22be308e	⚡ 重构为maven多模块架构	2020-12-22 01:11:28 +08:00
shengzhang	4962742988	⚡ v1.6.0 版本更新...	2020-12-18 00:57:54 +08:00
				`@@ -0,0 +1 @@`
				`org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.dev33.satoken.autowired.SaTokenSpringAutowired`