diff --git a/README.md b/README.md index 922b0115..8f398053 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.25.0

+

Sa-Token v1.26.0

一个轻量级 Java 权限认证框架,让鉴权变得简单、优雅!

diff --git a/pom.xml b/pom.xml index 5ed7a58a..2bcefbb5 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.dev33 sa-token-parent pom - 1.25.0 + 1.26.0 sa-token @@ -36,7 +36,7 @@ - 1.25.0 + 1.26.0 1.8 utf-8 utf-8 diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml index 16c764a0..2ab1dc05 100644 --- a/sa-token-core/pom.xml +++ b/sa-token-core/pom.xml @@ -7,7 +7,7 @@ cn.dev33 sa-token-parent - 1.25.0 + 1.26.0 jar diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java index 2bf87f7f..7d76ad59 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java @@ -47,7 +47,6 @@ public class SaBasicTemplate { /** * 对当前会话进行 Basic 校验(使用全局配置的账号密码),校验不通过则抛出异常 - * @param basicAccount 账号(格式为 user:password) */ public void check() { check(DEFAULT_REALM, SaManager.getConfig().getBasic()); @@ -62,7 +61,7 @@ public class SaBasicTemplate { } /** - * 对当前会话进行 Basic 校验(手动设置 Realm & 账号密码),校验不通过则抛出异常 + * 对当前会话进行 Basic 校验(手动设置 Realm 和 账号密码),校验不通过则抛出异常 * @param realm 领域 * @param account 账号(格式为 user:password) */ diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java index 668198f5..60a9d9aa 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java @@ -22,7 +22,6 @@ public class SaBasicUtil { /** * 对当前会话进行 Basic 校验(使用全局配置的账号密码),校验不通过则抛出异常 - * @param basicAccount 账号(格式为 user:password) */ public static void check() { saBasicTemplate.check(); @@ -37,7 +36,7 @@ public class SaBasicUtil { } /** - * 对当前会话进行 Basic 校验(手动设置 Realm & 账号密码),校验不通过则抛出异常 + * 对当前会话进行 Basic 校验(手动设置 Realm 和 账号密码),校验不通过则抛出异常 * @param realm 领域 * @param account 账号(格式为 user:password) */ 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 0d1a7d4a..11564126 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.25.0"; + public static final String VERSION_NO = "v1.26.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 5fe17cdc..4f9562d9 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.25.0 + 1.26.0 diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml index 1a265a68..b3258df1 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.25.0 + 1.26.0 diff --git a/sa-token-demo/sa-token-demo-oauth2-client/pom.xml b/sa-token-demo/sa-token-demo-oauth2-client/pom.xml index 65a1cf67..c3a7efcc 100644 --- a/sa-token-demo/sa-token-demo-oauth2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-oauth2-client/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.25.0 + 1.26.0 diff --git a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml b/sa-token-demo/sa-token-demo-oauth2-server/pom.xml index 5db99600..ec934aea 100644 --- a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml +++ b/sa-token-demo/sa-token-demo-oauth2-server/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.25.0 + 1.26.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 2b6c95fc..ff180acf 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.25.0 + 1.26.0 diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml index a681ac30..4b60f176 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.25.0 + 1.26.0 diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml index 8a089225..c746f7cb 100644 --- a/sa-token-demo/sa-token-demo-springboot/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot/pom.xml @@ -17,7 +17,7 @@ - 1.25.0 + 1.26.0 diff --git a/sa-token-demo/sa-token-demo-sso1-client/pom.xml b/sa-token-demo/sa-token-demo-sso1-client/pom.xml index 63ab9b45..3215da41 100644 --- a/sa-token-demo/sa-token-demo-sso1-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso1-client/pom.xml @@ -16,7 +16,7 @@ - 1.25.0 + 1.26.0 diff --git a/sa-token-demo/sa-token-demo-sso1-server/pom.xml b/sa-token-demo/sa-token-demo-sso1-server/pom.xml index 33ec3120..75297e1b 100644 --- a/sa-token-demo/sa-token-demo-sso1-server/pom.xml +++ b/sa-token-demo/sa-token-demo-sso1-server/pom.xml @@ -16,7 +16,7 @@ - 1.25.0 + 1.26.0 diff --git a/sa-token-demo/sa-token-demo-sso1/pom.xml b/sa-token-demo/sa-token-demo-sso1/pom.xml index e6086c4f..7975a305 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.25.0 + 1.26.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 baffc690..39a7564c 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.25.0 + 1.26.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 5a910676..7c69a5c0 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.25.0 + 1.26.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 c5e1daf7..c1209af4 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.25.0 + 1.26.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 2cbf6e68..10e7ddcf 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.25.0 + 1.26.0 diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml index 30619daa..ae7cf214 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.25.0 + 1.26.0 diff --git a/sa-token-doc/doc/README.md b/sa-token-doc/doc/README.md index 38729454..fb960be8 100644 --- a/sa-token-doc/doc/README.md +++ b/sa-token-doc/doc/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.25.0

+

Sa-Token v1.26.0

一个轻量级 Java 权限认证框架,让鉴权变得简单、优雅!

diff --git a/sa-token-doc/doc/index.html b/sa-token-doc/doc/index.html index a38a1eb3..694d63a1 100644 --- a/sa-token-doc/doc/index.html +++ b/sa-token-doc/doc/index.html @@ -22,6 +22,7 @@