From d1ef107662959624c901ebd54df2ff3779072053 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Fri, 23 Jun 2023 19:41:26 +0800 Subject: [PATCH] v1.35.0.RC --- README.md | 2 +- mvn clean.bat | 5 +- pom.xml | 2 +- sa-token-bom/pom.xml | 83 ++++++++++++++++++- .../dev33/satoken/annotation/SaCheckOr.java | 2 +- .../SaCheckElementAnnotationFunction.java | 2 +- .../SaCheckMethodAnnotationFunction.java | 2 +- .../strategy/SaCheckOrAnnotationFunction.java | 2 +- .../fun/strategy/SaCreateSessionFunction.java | 2 +- .../strategy/SaCreateStpLogicFunction.java | 2 +- .../fun/strategy/SaCreateTokenFunction.java | 2 +- .../SaGenerateUniqueTokenFunction.java | 2 +- .../fun/strategy/SaGetAnnotationFunction.java | 2 +- .../fun/strategy/SaHasElementFunction.java | 2 +- .../SaIsAnnotationPresentFunction.java | 2 +- .../cn/dev33/satoken/util/SaTokenConsts.java | 2 +- .../cn/dev33/satoken/util/SaValue2Box.java | 2 +- .../sa-token-demo-alone-redis-cluster/pom.xml | 2 +- .../sa-token-demo-alone-redis/pom.xml | 2 +- .../sa-token-demo-bom-import/pom.xml | 4 +- sa-token-demo/sa-token-demo-case/pom.xml | 2 +- .../sa-token-demo-cross-cookie-server/pom.xml | 2 +- .../sa-token-demo-cross-header-server/pom.xml | 2 +- .../sa-token-demo-dubbo-consumer/pom.xml | 2 +- .../sa-token-demo-dubbo-provider/pom.xml | 2 +- .../sa-token-demo-dubbo3-consumer/pom.xml | 2 +- .../sa-token-demo-dubbo3-provider/pom.xml | 2 +- sa-token-demo/sa-token-demo-grpc/pom.xml | 2 +- sa-token-demo/sa-token-demo-jwt/pom.xml | 2 +- .../sa-token-demo-oauth2-client/pom.xml | 2 +- .../sa-token-demo-oauth2-server/pom.xml | 2 +- .../sa-token-demo-quick-login/pom.xml | 2 +- .../pom.xml | 4 +- .../cc/sa_token/RememberMeApplication.java | 0 .../controller/UserLoginController.java | 0 .../src/main/resources/application.yml | 0 sa-token-demo/sa-token-demo-solon/pom.xml | 2 +- .../sa-token-demo-springboot-redis/pom.xml | 2 +- .../sa-token-demo-springboot-redisson/pom.xml | 2 +- .../sa-token-demo-springboot/pom.xml | 2 +- .../sa-token-demo-springboot3-redis/pom.xml | 2 +- .../sa-token-demo-sso-server-solon/pom.xml | 2 +- .../sa-token-demo-sso1-client-solon/pom.xml | 2 +- .../sa-token-demo-sso2-client-solon/pom.xml | 2 +- .../sa-token-demo-sso3-client-solon/pom.xml | 2 +- .../sa-token-demo-sso-server/pom.xml | 2 +- .../sa-token-demo-sso1-client/pom.xml | 2 +- .../sa-token-demo-sso2-client/pom.xml | 2 +- .../sa-token-demo-sso3-client/pom.xml | 2 +- sa-token-demo/sa-token-demo-test/pom.xml | 2 +- sa-token-demo/sa-token-demo-thymeleaf/pom.xml | 2 +- .../sa-token-demo-webflux-springboot3/pom.xml | 2 +- sa-token-demo/sa-token-demo-webflux/pom.xml | 2 +- .../sa-token-demo-websocket-spring/pom.xml | 2 +- sa-token-demo/sa-token-demo-websocket/pom.xml | 2 +- sa-token-dependencies/pom.xml | 2 +- sa-token-doc/README.md | 2 +- sa-token-doc/doc.html | 6 +- sa-token-doc/index.html | 2 +- sa-token-doc/start/download.md | 2 +- 60 files changed, 142 insertions(+), 64 deletions(-) rename sa-token-demo/sa-token-demo-remember-me/{server_project => sa-token-demo-remember-me-server}/pom.xml (93%) rename sa-token-demo/sa-token-demo-remember-me/{server_project => sa-token-demo-remember-me-server}/src/main/java/cc/sa_token/RememberMeApplication.java (100%) rename sa-token-demo/sa-token-demo-remember-me/{server_project => sa-token-demo-remember-me-server}/src/main/java/cc/sa_token/controller/UserLoginController.java (100%) rename sa-token-demo/sa-token-demo-remember-me/{server_project => sa-token-demo-remember-me-server}/src/main/resources/application.yml (100%) diff --git a/README.md b/README.md index e0719421..b17e8479 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.34.1

+

Sa-Token v1.35.0.RC

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

diff --git a/mvn clean.bat b/mvn clean.bat index ae4d1172..4aab58c5 100644 --- a/mvn clean.bat +++ b/mvn clean.bat @@ -10,11 +10,8 @@ cd sa-token-demo-alone-redis-cluster & call mvn clean & cd .. cd sa-token-demo-case & call mvn clean & cd .. cd sa-token-demo-grpc & call mvn clean & cd .. cd sa-token-demo-jwt & call mvn clean & cd .. -cd sa-token-demo-oauth2-client & call mvn clean & cd .. -cd sa-token-demo-oauth2-server & call mvn clean & cd .. cd sa-token-demo-quick-login & call mvn clean & cd .. cd sa-token-demo-solon & call mvn clean & cd .. -cd sa-token-demo-case & call mvn clean & cd .. cd sa-token-demo-springboot & call mvn clean & cd .. cd sa-token-demo-springboot3-redis & call mvn clean & cd .. cd sa-token-demo-springboot-redis & call mvn clean & cd .. @@ -60,7 +57,7 @@ cd sa-token-demo-dubbo3-provider & call mvn clean & cd .. cd .. cd sa-token-demo-remember-me -cd server_project & call mvn clean & cd .. +cd sa-token-demo-remember-me-server & call mvn clean & cd .. cd .. diff --git a/pom.xml b/pom.xml index c47da5c8..5278a0e1 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ - 1.34.1 + 1.35.0.RC 1.8 utf-8 utf-8 diff --git a/sa-token-bom/pom.xml b/sa-token-bom/pom.xml index 3aaeacb4..11909dfc 100644 --- a/sa-token-bom/pom.xml +++ b/sa-token-bom/pom.xml @@ -10,9 +10,10 @@ pom sa-token-bom Sa-Token Bom + https://github.com/dromara/sa-token - 1.34.1 + 1.35.0.RC @@ -168,4 +169,84 @@ + + + org.sonatype.oss + oss-parent + 7 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 1.8 + 1.8 + UTF-8 + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.7 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0.0,) + + enforce + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java index b008f083..d84c41ff 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java @@ -26,7 +26,7 @@ import java.lang.annotation.Target; *

可标注在方法、类上(效果等同于标注在此类的所有方法上) * * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.METHOD, ElementType.TYPE }) diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckElementAnnotationFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckElementAnnotationFunction.java index 97a67c2e..1049fdbb 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckElementAnnotationFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckElementAnnotationFunction.java @@ -25,7 +25,7 @@ import java.util.function.Consumer; *

返回:无

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaCheckElementAnnotationFunction extends Consumer { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckMethodAnnotationFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckMethodAnnotationFunction.java index 8bcd4318..8ff22263 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckMethodAnnotationFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckMethodAnnotationFunction.java @@ -25,7 +25,7 @@ import java.util.function.Consumer; *

返回:无

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaCheckMethodAnnotationFunction extends Consumer { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckOrAnnotationFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckOrAnnotationFunction.java index c6f6ad54..4a9c632f 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckOrAnnotationFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckOrAnnotationFunction.java @@ -26,7 +26,7 @@ import java.util.function.Consumer; *

返回:无

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaCheckOrAnnotationFunction extends Consumer { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateSessionFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateSessionFunction.java index 0963edff..25770689 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateSessionFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateSessionFunction.java @@ -26,7 +26,7 @@ import java.util.function.Function; *

返回:SaSession对象

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaCreateSessionFunction extends Function { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateStpLogicFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateStpLogicFunction.java index 2c3c75d6..fe8f0980 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateStpLogicFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateStpLogicFunction.java @@ -26,7 +26,7 @@ import java.util.function.Function; *

返回:创建好的 StpLogic 对象

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaCreateStpLogicFunction extends Function { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateTokenFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateTokenFunction.java index f85c40bb..0914c196 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateTokenFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateTokenFunction.java @@ -24,7 +24,7 @@ import java.util.function.BiFunction; *

返回:token 值

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaCreateTokenFunction extends BiFunction { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGenerateUniqueTokenFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGenerateUniqueTokenFunction.java index d1a72f0f..7bfd4386 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGenerateUniqueTokenFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGenerateUniqueTokenFunction.java @@ -25,7 +25,7 @@ import java.util.function.Supplier; *

返回:生成的token

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaGenerateUniqueTokenFunction { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGetAnnotationFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGetAnnotationFunction.java index 6908b639..54b70c08 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGetAnnotationFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGetAnnotationFunction.java @@ -26,7 +26,7 @@ import java.util.function.BiFunction; *

返回:注解对象

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaGetAnnotationFunction extends BiFunction , Annotation> { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaHasElementFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaHasElementFunction.java index 3ee75089..f0f515a1 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaHasElementFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaHasElementFunction.java @@ -25,7 +25,7 @@ import java.util.function.BiFunction; *

返回:是否包含

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaHasElementFunction extends BiFunction, String, Boolean> { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaIsAnnotationPresentFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaIsAnnotationPresentFunction.java index 88fe7072..2c6cc3af 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaIsAnnotationPresentFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaIsAnnotationPresentFunction.java @@ -26,7 +26,7 @@ import java.util.function.BiFunction; *

返回:是否包含

* * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ @FunctionalInterface public interface SaIsAnnotationPresentFunction extends BiFunction, Boolean> { 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 2c2d94d8..4ae3b2f0 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 @@ -36,7 +36,7 @@ public class SaTokenConsts { /** * Sa-Token 当前版本号 */ - public static final String VERSION_NO = "v1.34.1"; + public static final String VERSION_NO = "v1.35.0.RC"; /** * Sa-Token 开源地址 Gitee diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java index db627b64..54b96182 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java @@ -20,7 +20,7 @@ package cn.dev33.satoken.util; * 封装两个值的容器,方便取值、写值等操作,value1 和 value2 用逗号隔开,形如:123,abc * * @author click33 - * @since 1.35.0 + * @since 1.35.0.RC */ public class SaValue2Box { diff --git a/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml b/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml index 1db45182..d585ba57 100644 --- a/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml +++ b/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC 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 8688e25e..4eb084cd 100644 --- a/sa-token-demo/sa-token-demo-alone-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-alone-redis/pom.xml @@ -17,7 +17,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-bom-import/pom.xml b/sa-token-demo/sa-token-demo-bom-import/pom.xml index 8746ea69..88fec036 100644 --- a/sa-token-demo/sa-token-demo-bom-import/pom.xml +++ b/sa-token-demo/sa-token-demo-bom-import/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0 @@ -73,7 +73,7 @@ cn.dev33 sa-token-bom - 1.34.1 + 1.35.0 pom import diff --git a/sa-token-demo/sa-token-demo-case/pom.xml b/sa-token-demo/sa-token-demo-case/pom.xml index 77da474b..0865cc21 100644 --- a/sa-token-demo/sa-token-demo-case/pom.xml +++ b/sa-token-demo/sa-token-demo-case/pom.xml @@ -17,7 +17,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-cookie-server/pom.xml b/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-cookie-server/pom.xml index bd794616..99c521fd 100644 --- a/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-cookie-server/pom.xml +++ b/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-cookie-server/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC com.pj.SaTokenCrossCookieApplication diff --git a/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-header-server/pom.xml b/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-header-server/pom.xml index feaa17bf..d1704fcf 100644 --- a/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-header-server/pom.xml +++ b/sa-token-demo/sa-token-demo-cross/sa-token-demo-cross-header-server/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC com.pj.SaTokenCrossHeaderApplication diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/pom.xml index 910dcd21..6fd79a73 100644 --- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.34.1 + 1.35.0.RC 2.7.21 1.4.2 diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/pom.xml index 026c80ce..74dc176e 100644 --- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.34.1 + 1.35.0.RC 2.7.21 1.4.2 diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml index 07e0a39e..e6f70550 100644 --- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.34.1 + 1.35.0.RC 3.2.2 2.2.2 diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml index 87bfb9d7..57890bc2 100644 --- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.34.1 + 1.35.0.RC 3.2.2 2.2.2 diff --git a/sa-token-demo/sa-token-demo-grpc/pom.xml b/sa-token-demo/sa-token-demo-grpc/pom.xml index 07f20769..23d3deb7 100644 --- a/sa-token-demo/sa-token-demo-grpc/pom.xml +++ b/sa-token-demo/sa-token-demo-grpc/pom.xml @@ -27,7 +27,7 @@ UTF-8 UTF-8 1.18.10 - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml index d2c56bbb..464e1955 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.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/pom.xml b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/pom.xml index 1b62aa8f..764ccfb5 100644 --- a/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/pom.xml b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/pom.xml index f96425a2..6570b269 100644 --- a/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/pom.xml +++ b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/pom.xml @@ -17,7 +17,7 @@ 1.8 3.1.1 - 1.34.1 + 1.35.0.RC 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 250ab83c..b5525ba0 100644 --- a/sa-token-demo/sa-token-demo-quick-login/pom.xml +++ b/sa-token-demo/sa-token-demo-quick-login/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-remember-me/server_project/pom.xml b/sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/pom.xml similarity index 93% rename from sa-token-demo/sa-token-demo-remember-me/server_project/pom.xml rename to sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/pom.xml index 22654e28..9d883615 100644 --- a/sa-token-demo/sa-token-demo-remember-me/server_project/pom.xml +++ b/sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/pom.xml @@ -5,7 +5,7 @@ 4.0.0 cn.dev33 - remember_me + sa-token-demo-remember-me-server 1.0-SNAPSHOT @@ -17,7 +17,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-remember-me/server_project/src/main/java/cc/sa_token/RememberMeApplication.java b/sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/src/main/java/cc/sa_token/RememberMeApplication.java similarity index 100% rename from sa-token-demo/sa-token-demo-remember-me/server_project/src/main/java/cc/sa_token/RememberMeApplication.java rename to sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/src/main/java/cc/sa_token/RememberMeApplication.java diff --git a/sa-token-demo/sa-token-demo-remember-me/server_project/src/main/java/cc/sa_token/controller/UserLoginController.java b/sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/src/main/java/cc/sa_token/controller/UserLoginController.java similarity index 100% rename from sa-token-demo/sa-token-demo-remember-me/server_project/src/main/java/cc/sa_token/controller/UserLoginController.java rename to sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/src/main/java/cc/sa_token/controller/UserLoginController.java diff --git a/sa-token-demo/sa-token-demo-remember-me/server_project/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/src/main/resources/application.yml similarity index 100% rename from sa-token-demo/sa-token-demo-remember-me/server_project/src/main/resources/application.yml rename to sa-token-demo/sa-token-demo-remember-me/sa-token-demo-remember-me-server/src/main/resources/application.yml diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml index 9b755fa6..a1c9f2c1 100644 --- a/sa-token-demo/sa-token-demo-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-solon/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC 2.2.3 UTF-8 UTF-8 diff --git a/sa-token-demo/sa-token-demo-springboot-redis/pom.xml b/sa-token-demo/sa-token-demo-springboot-redis/pom.xml index 26f52aad..db42096b 100644 --- a/sa-token-demo/sa-token-demo-springboot-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot-redis/pom.xml @@ -17,7 +17,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml b/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml index d56f36cf..28fa1d1c 100644 --- a/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml @@ -17,7 +17,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml index 09ee17a3..2a3950a6 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.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml b/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml index 431a9e3c..cac1f063 100644 --- a/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml index 7ace1f12..64610c58 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC 2.2.3 diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml index 99c689a4..5319721e 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml index 659079c4..3306f5d0 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml index fe635cd4..6ad2104d 100644 --- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml index 96283484..9d521c31 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml index 46a744ec..8deaccfa 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml index 11e670fe..bbefbb7d 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml index f2602cb4..f33871f5 100644 --- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-test/pom.xml b/sa-token-demo/sa-token-demo-test/pom.xml index 4f4da25d..d7c578da 100644 --- a/sa-token-demo/sa-token-demo-test/pom.xml +++ b/sa-token-demo/sa-token-demo-test/pom.xml @@ -17,7 +17,7 @@ - 1.34.1 + 1.35.0.RC com.pj.SaTokenApplication diff --git a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml index 23921803..97b13037 100644 --- a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml +++ b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml b/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml index e86a7670..53d1d239 100644 --- a/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml +++ b/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml @@ -16,7 +16,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml index e1d9f9a3..f9fbf676 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.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml index 788bbccb..a118fe17 100644 --- a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml +++ b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml @@ -17,7 +17,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-demo/sa-token-demo-websocket/pom.xml b/sa-token-demo/sa-token-demo-websocket/pom.xml index a19998b1..caad7d8e 100644 --- a/sa-token-demo/sa-token-demo-websocket/pom.xml +++ b/sa-token-demo/sa-token-demo-websocket/pom.xml @@ -17,7 +17,7 @@ - 1.34.1 + 1.35.0.RC diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml index d91e3402..30b28c8a 100644 --- a/sa-token-dependencies/pom.xml +++ b/sa-token-dependencies/pom.xml @@ -12,7 +12,7 @@ Sa-Token Dependencies - 1.34.1 + 1.35.0.RC 2.5.15 diff --git a/sa-token-doc/README.md b/sa-token-doc/README.md index 5c9b57ac..1fe8b051 100644 --- a/sa-token-doc/README.md +++ b/sa-token-doc/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.34.1

+

Sa-Token v1.35.0.RC

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

diff --git a/sa-token-doc/doc.html b/sa-token-doc/doc.html index d2c05613..399a0a4b 100644 --- a/sa-token-doc/doc.html +++ b/sa-token-doc/doc.html @@ -18,7 +18,7 @@

Sa-Token

- v1.34.1 + v1.35.0.RC
@@ -101,7 +101,7 @@ 加入讨论群 赞助 - 🔥 SSO商业版 + ?? SSO商业版
相关资源 @@ -152,7 +152,7 @@