From 30b47573c44a736d1a3733e8092d60ed40baccbd Mon Sep 17 00:00:00 2001 From: shengzhang <2393584716@qq.com> Date: Tue, 9 Feb 2021 01:17:52 +0800 Subject: [PATCH] =?UTF-8?q?v1.13.0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- pom.xml | 4 ++-- sa-token-core/pom.xml | 2 +- .../cn/dev33/satoken/config/SaTokenConfig.java | 8 ++++---- .../cn/dev33/satoken/util/SaTokenConsts.java | 2 +- .../dev33/satoken/util/SaTokenInsideUtil.java | 2 ++ sa-token-dao-redis-jackson/pom.xml | 2 +- sa-token-dao-redis/pom.xml | 2 +- sa-token-demo-jwt/pom.xml | 2 +- sa-token-demo-springboot/pom.xml | 2 +- sa-token-doc/doc/README.md | 4 ++-- sa-token-doc/doc/index.html | 3 ++- sa-token-doc/doc/more/update-log.md | 17 ++++++++++++++++- sa-token-doc/doc/start/download.md | 4 ++-- sa-token-doc/doc/start/example.md | 2 +- sa-token-doc/doc/use/at-check.md | 2 +- sa-token-doc/doc/use/dao-extend.md | 4 ++-- sa-token-doc/index.css | 2 +- sa-token-doc/index.html | 5 +++-- sa-token-spring-aop/pom.xml | 2 +- sa-token-spring-boot-starter/pom.xml | 2 +- 21 files changed, 48 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 6da4b747..1f22d362 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

logo

-

sa-token v1.12.1

+

sa-token v1.13.0

这可能是史上功能最全的Java权限认证框架！

- + diff --git a/pom.xml b/pom.xml index 98a2e798..08ee7e92 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.dev33 sa-token-parent pom - 1.12.1 + 1.13.0 sa-token @@ -37,7 +37,7 @@ - 1.12.1 + 1.13.0 1.8 utf-8 utf-8 diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml index 3d3e6fcb..44f1801d 100644 --- a/sa-token-core/pom.xml +++ b/sa-token-core/pom.xml @@ -7,7 +7,7 @@ cn.dev33 sa-token-parent - 1.12.1 + 1.13.0 jar diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java index 14722135..6c663e5e 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java @@ -123,7 +123,7 @@ public class SaTokenConfig { } /** - * @param 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) + * @param isShare 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) */ public void setIsShare(Boolean isShare) { this.isShare = isShare; @@ -151,7 +151,7 @@ public class SaTokenConfig { } /** - * @param 是否尝试从header里读取token + * @param isReadHead 是否尝试从header里读取token */ public void setIsReadHead(Boolean isReadHead) { this.isReadHead = isReadHead; @@ -165,7 +165,7 @@ public class SaTokenConfig { } /** - * @param 是否尝试从cookie里读取token + * @param isReadCookie 是否尝试从cookie里读取token */ public void setIsReadCookie(Boolean isReadCookie) { this.isReadCookie = isReadCookie; @@ -179,7 +179,7 @@ public class SaTokenConfig { } /** - * @param token风格(默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik) + * @param tokenStyle token风格(默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik) */ public void setTokenStyle(String tokenStyle) { this.tokenStyle = tokenStyle; 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 b7e47f48..76d844b3 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.12.1"; + public static final String VERSION_NO = "v1.13.0"; /** * sa-token 开源地址 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenInsideUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenInsideUtil.java index 17052ac2..32ee9270 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenInsideUtil.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenInsideUtil.java @@ -43,6 +43,8 @@ public class SaTokenInsideUtil { /** * 指定字符串是否为null或者空字符串 + * @param str 指定字符串 + * @return 是否为null或者空字符串 */ public static boolean isEmpty(String str) { return str == null || "".equals(str); diff --git a/sa-token-dao-redis-jackson/pom.xml b/sa-token-dao-redis-jackson/pom.xml index e10f4ed0..a48b796b 100644 --- a/sa-token-dao-redis-jackson/pom.xml +++ b/sa-token-dao-redis-jackson/pom.xml @@ -7,7 +7,7 @@ cn.dev33 sa-token-parent - 1.12.1 + 1.13.0 jar diff --git a/sa-token-dao-redis/pom.xml b/sa-token-dao-redis/pom.xml index d5fb2f12..14426358 100644 --- a/sa-token-dao-redis/pom.xml +++ b/sa-token-dao-redis/pom.xml @@ -7,7 +7,7 @@ cn.dev33 sa-token-parent - 1.12.1 + 1.13.0 jar diff --git a/sa-token-demo-jwt/pom.xml b/sa-token-demo-jwt/pom.xml index 8cc075cd..888164ac 100644 --- a/sa-token-demo-jwt/pom.xml +++ b/sa-token-demo-jwt/pom.xml @@ -16,7 +16,7 @@ - 1.12.1 + 1.13.0 diff --git a/sa-token-demo-springboot/pom.xml b/sa-token-demo-springboot/pom.xml index 42e10811..848157f0 100644 --- a/sa-token-demo-springboot/pom.xml +++ b/sa-token-demo-springboot/pom.xml @@ -16,7 +16,7 @@ - 1.12.1 + 1.13.0 diff --git a/sa-token-doc/doc/README.md b/sa-token-doc/doc/README.md index 6da4b747..1f22d362 100644 --- a/sa-token-doc/doc/README.md +++ b/sa-token-doc/doc/README.md @@ -1,11 +1,11 @@

logo

-

sa-token v1.12.1

+

sa-token v1.13.0

这可能是史上功能最全的Java权限认证框架！

- + diff --git a/sa-token-doc/doc/index.html b/sa-token-doc/doc/index.html index ada19106..3d0c9143 100644 --- a/sa-token-doc/doc/index.html +++ b/sa-token-doc/doc/index.html @@ -21,6 +21,7 @@