From 7d0037066a652ce6331049fb7de46e374b65671b Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 2 Jul 2021 17:33:31 +0800
Subject: [PATCH] =?UTF-8?q?v1.21.0=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
pom.xml | 4 ++--
sa-token-core/pom.xml | 2 +-
.../satoken/exception/BackResultException.java | 1 +
.../cn/dev33/satoken/sso/SaSsoInterface.java | 4 +++-
.../java/cn/dev33/satoken/sso/SaSsoUtil.java | 4 +++-
.../main/java/cn/dev33/satoken/stp/StpLogic.java | 8 ++++----
.../main/java/cn/dev33/satoken/stp/StpUtil.java | 8 ++++----
.../cn/dev33/satoken/util/SaTokenConsts.java | 2 +-
sa-token-demo/sa-token-demo-alone-redis/pom.xml | 2 +-
sa-token-demo/sa-token-demo-jwt/pom.xml | 2 +-
sa-token-demo/sa-token-demo-quick-login/pom.xml | 2 +-
sa-token-demo/sa-token-demo-solon/pom.xml | 2 +-
sa-token-demo/sa-token-demo-springboot/pom.xml | 2 +-
sa-token-demo/sa-token-demo-sso1/pom.xml | 2 +-
sa-token-demo/sa-token-demo-sso2-client/pom.xml | 4 ++--
sa-token-demo/sa-token-demo-sso2-server/pom.xml | 2 +-
sa-token-demo/sa-token-demo-sso3-client/pom.xml | 2 +-
sa-token-demo/sa-token-demo-sso3-server/pom.xml | 2 +-
sa-token-demo/sa-token-demo-webflux/pom.xml | 2 +-
sa-token-doc/doc/README.md | 2 +-
sa-token-doc/doc/index.html | 3 ++-
sa-token-doc/doc/more/update-log.md | 10 ++++++++++
sa-token-doc/doc/plugin/alone-redis.md | 2 +-
sa-token-doc/doc/plugin/aop-at.md | 2 +-
sa-token-doc/doc/plugin/quick-login.md | 2 +-
sa-token-doc/doc/plugin/temp-token.md | 2 +-
sa-token-doc/doc/sso/sso-type2.md | 6 +++---
sa-token-doc/doc/start/download.md | 16 ++++++++--------
sa-token-doc/doc/start/example.md | 2 +-
sa-token-doc/doc/start/webflux-example.md | 2 +-
sa-token-doc/doc/use/dao-extend.md | 4 ++--
sa-token-doc/index.html | 2 +-
sa-token-plugin/pom.xml | 2 +-
sa-token-plugin/sa-token-alone-redis/pom.xml | 2 +-
.../sa-token-dao-redis-jackson/pom.xml | 2 +-
sa-token-plugin/sa-token-dao-redis/pom.xml | 2 +-
sa-token-plugin/sa-token-oauth2/pom.xml | 2 +-
sa-token-plugin/sa-token-quick-login/pom.xml | 2 +-
sa-token-plugin/sa-token-spring-aop/pom.xml | 2 +-
sa-token-plugin/sa-token-temp-jwt/pom.xml | 2 +-
sa-token-starter/pom.xml | 2 +-
.../sa-token-reactor-spring-boot-starter/pom.xml | 2 +-
sa-token-starter/sa-token-servlet/pom.xml | 2 +-
sa-token-starter/sa-token-solon-plugin/pom.xml | 4 ++--
.../sa-token-spring-boot-starter/pom.xml | 2 +-
46 files changed, 79 insertions(+), 63 deletions(-)
diff --git a/README.md b/README.md
index 2a0a5301..f4f7d098 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-Sa-Token v1.20.0
+Sa-Token v1.21.0
这可能是史上功能最全的 Java 权限认证框架！
diff --git a/pom.xml b/pom.xml
index 604d48b6..8906278f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
cn.dev33
sa-token-parent
pom
- 1.20.0
+ 1.21.0
sa-token
@@ -36,7 +36,7 @@
- 1.20.0
+ 1.21.0
1.8
utf-8
utf-8
diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml
index f114e86f..e7f61269 100644
--- a/sa-token-core/pom.xml
+++ b/sa-token-core/pom.xml
@@ -7,7 +7,7 @@
cn.dev33
sa-token-parent
- 1.20.0
+ 1.21.0
jar
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
index 87b2c5ed..b978bea0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
@@ -19,6 +19,7 @@ public class BackResultException extends SaTokenException {
/**
* 构造
+ * @param result 要输出的结果
*/
public BackResultException(Object result) {
super(String.valueOf(result));
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoInterface.java
index f5a5b46e..b318ca36 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoInterface.java
@@ -87,7 +87,9 @@ public interface SaSsoInterface {
/**
* 根据 Ticket码 获取账号id，并转换为指定类型
+ * @param 要转换的类型
* @param ticket Ticket码
+ * @param cs 要转换的类型
* @return 账号id
*/
public default T getLoginId(String ticket, Class cs) {
@@ -136,7 +138,7 @@ public interface SaSsoInterface {
}
/**
- * 根据 Client端登录地址 & back地址 ，构建[SSO-Server端-认证地址]
+ * 构建URL：Server端 单点登录地址
* @param clientLoginUrl Client端登录地址
* @param back 回调路径
* @return [SSO-Server端-认证地址 ]
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
index e8ccac00..c5c403ef 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
@@ -52,7 +52,9 @@ public class SaSsoUtil {
/**
* 根据 Ticket码 获取账号id，并转换为指定类型
+ * @param 要转换的类型
* @param ticket Ticket码
+ * @param cs 要转换的类型
* @return 账号id
*/
public static T getLoginId(String ticket, Class cs) {
@@ -77,7 +79,7 @@ public class SaSsoUtil {
}
/**
- * 根据 Client端登录地址 & back地址 ，构建[SSO-Server端-认证地址]
+ * 构建URL：Server端 单点登录地址
* @param clientLoginUrl Client端登录地址
* @param back 回调路径
* @return [SSO-Server端-认证地址 ]
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 883ef28b..f898eb83 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -340,8 +340,8 @@ public class StpLogic {
}
/**
- * 会话注销，根据账号id & 设备标识 （踢人下线）
- * 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-2
+ * 会话注销，根据账号id and 设备标识 （踢人下线）
+ *
当对方再次访问系统时，会抛出NotLoginException异常，场景值=-2
* @param loginId 账号id
* @param device 设备标识 (填null代表所有注销设备)
*/
@@ -1235,7 +1235,7 @@ public class StpLogic {
/**
* 在当前会话 开启二级认证
- * @param timeout 维持时间 (单位: 秒)
+ * @param safeTime 维持时间 (单位: 秒)
*/
public void openSafe(long safeTime) {
long eff = System.currentTimeMillis() + safeTime * 1000;
@@ -1265,7 +1265,7 @@ public class StpLogic {
/**
* 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
- * @return
+ * @return 剩余有效时间
*/
public long getSafeTime() {
long eff = getTokenSession().get(SaTokenConsts.SAFE_AUTH_SAVE_KEY, 0L);
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index d5ce4618..3d8837a9 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -120,7 +120,7 @@ public class StpUtil {
/**
* 会话注销，根据账号id （踢人下线）
- * 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-2
+ *
当对方再次访问系统时，会抛出NotLoginException异常，场景值=-2
* @param loginId 账号id
*/
public static void logoutByLoginId(Object loginId) {
@@ -128,7 +128,7 @@ public class StpUtil {
}
/**
- * 会话注销，根据账号id & 设备标识 （踢人下线）
+ * 会话注销，根据账号id and 设备标识 （踢人下线）
* 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-2
* @param loginId 账号id
* @param device 设备标识
@@ -596,7 +596,7 @@ public class StpUtil {
/**
* 在当前会话 开启二级认证
- * @param timeout 维持时间 (单位: 秒)
+ * @param safeTime 维持时间 (单位: 秒)
*/
public static void openSafe(long safeTime) {
stpLogic.openSafe(safeTime);
@@ -619,7 +619,7 @@ public class StpUtil {
/**
* 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
- * @return
+ * @return 剩余有效时间
*/
public static long getSafeTime() {
return stpLogic.getSafeTime();
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
index 5e0baf3c..35170404 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
@@ -13,7 +13,7 @@ public class SaTokenConsts {
/**
* Sa-Token 当前版本号
*/
- public static final String VERSION_NO = "v1.20.0";
+ public static final String VERSION_NO = "v1.21.0";
/**
* Sa-Token 开源地址
diff --git a/sa-token-demo/sa-token-demo-alone-redis/pom.xml b/sa-token-demo/sa-token-demo-alone-redis/pom.xml
index 55fd9da7..b0d85f91 100644
--- a/sa-token-demo/sa-token-demo-alone-redis/pom.xml
+++ b/sa-token-demo/sa-token-demo-alone-redis/pom.xml
@@ -16,7 +16,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml
index a4bb5357..bfa171f3 100644
--- a/sa-token-demo/sa-token-demo-jwt/pom.xml
+++ b/sa-token-demo/sa-token-demo-jwt/pom.xml
@@ -16,7 +16,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-quick-login/pom.xml b/sa-token-demo/sa-token-demo-quick-login/pom.xml
index df88375b..0d7be840 100644
--- a/sa-token-demo/sa-token-demo-quick-login/pom.xml
+++ b/sa-token-demo/sa-token-demo-quick-login/pom.xml
@@ -15,7 +15,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml
index 3de6a486..8f6b92d9 100644
--- a/sa-token-demo/sa-token-demo-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-solon/pom.xml
@@ -9,7 +9,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml
index 996b20cd..02ced370 100644
--- a/sa-token-demo/sa-token-demo-springboot/pom.xml
+++ b/sa-token-demo/sa-token-demo-springboot/pom.xml
@@ -16,7 +16,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-sso1/pom.xml b/sa-token-demo/sa-token-demo-sso1/pom.xml
index a50e7d8f..9cc08883 100644
--- a/sa-token-demo/sa-token-demo-sso1/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso1/pom.xml
@@ -16,7 +16,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-sso2-client/pom.xml b/sa-token-demo/sa-token-demo-sso2-client/pom.xml
index 89dc1230..ca18d246 100644
--- a/sa-token-demo/sa-token-demo-sso2-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso2-client/pom.xml
@@ -16,7 +16,7 @@
- 1.20.0
+ 1.21.0
@@ -51,7 +51,7 @@
cn.dev33
sa-token-alone-redis
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-sso2-server/pom.xml b/sa-token-demo/sa-token-demo-sso2-server/pom.xml
index f519efb8..d0a88218 100644
--- a/sa-token-demo/sa-token-demo-sso2-server/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso2-server/pom.xml
@@ -16,7 +16,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-sso3-client/pom.xml b/sa-token-demo/sa-token-demo-sso3-client/pom.xml
index 5d90d620..1b5a77e1 100644
--- a/sa-token-demo/sa-token-demo-sso3-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso3-client/pom.xml
@@ -16,7 +16,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-sso3-server/pom.xml b/sa-token-demo/sa-token-demo-sso3-server/pom.xml
index 84123fd5..7a4741f8 100644
--- a/sa-token-demo/sa-token-demo-sso3-server/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso3-server/pom.xml
@@ -16,7 +16,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml
index 860f619e..98c3d7df 100644
--- a/sa-token-demo/sa-token-demo-webflux/pom.xml
+++ b/sa-token-demo/sa-token-demo-webflux/pom.xml
@@ -16,7 +16,7 @@
- 1.20.0
+ 1.21.0
diff --git a/sa-token-doc/doc/README.md b/sa-token-doc/doc/README.md
index a5afe8e7..4e2ea02e 100644
--- a/sa-token-doc/doc/README.md
+++ b/sa-token-doc/doc/README.md
@@ -1,7 +1,7 @@
-Sa-Token v1.20.0
+Sa-Token v1.21.0
这可能是史上功能最全的 Java 权限认证框架！
diff --git a/sa-token-doc/doc/index.html b/sa-token-doc/doc/index.html
index 42f7a71e..87284f88 100644
--- a/sa-token-doc/doc/index.html
+++ b/sa-token-doc/doc/index.html
@@ -21,6 +21,7 @@