diff --git a/README.md b/README.md index 0efaaddf..fb64fd58 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.29.0

+

Sa-Token v1.30.0.RC

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

diff --git a/mvn clean.bat b/mvn clean.bat index c266da31..701b443c 100644 --- a/mvn clean.bat +++ b/mvn clean.bat @@ -5,75 +5,24 @@ call mvn clean :: demo模块clean cd sa-token-demo -cd sa-token-demo-jwt -call mvn clean -cd .. - -cd sa-token-demo-springboot -call mvn clean -cd .. - -cd sa-token-demo-webflux -call mvn clean -cd .. - -cd sa-token-demo-solon -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-alone-redis -call mvn clean -cd .. - -cd sa-token-demo-thymeleaf -call mvn clean -cd .. - -cd sa-token-demo-sso-server -call mvn clean -cd .. - -cd sa-token-demo-sso1-client -call mvn clean -cd .. - -cd sa-token-demo-sso2-client -call mvn clean -cd .. - -cd sa-token-demo-sso3-client -call mvn clean -cd .. - -cd sa-token-demo-jwt -call mvn clean -cd .. - -cd sa-token-demo-jwt -call mvn clean -cd .. - - -cd sa-token-demo-dubbo-provider -call mvn clean -cd .. - -cd sa-token-demo-dubbo-consumer -call mvn clean -cd .. - +cd sa-token-demo-springboot & call mvn clean & cd .. +cd sa-token-demo-webflux & call mvn clean & cd .. +cd sa-token-demo-solon & 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-alone-redis & call mvn clean & cd .. +cd sa-token-demo-thymeleaf & call mvn clean & cd .. +cd sa-token-demo-sso-server & call mvn clean & cd .. +cd sa-token-demo-sso1-client & call mvn clean & cd .. +cd sa-token-demo-sso2-client & call mvn clean & cd .. +cd sa-token-demo-sso3-client & call mvn clean & cd .. +cd sa-token-demo-sso3-client-nosdk & call mvn clean & cd .. +cd sa-token-demo-jwt & call mvn clean & cd .. +cd sa-token-demo-dubbo-provider & call mvn clean & cd .. +cd sa-token-demo-dubbo-consumer & call mvn clean & cd .. +cd sa-token-demo-websocket & call mvn clean & cd .. +cd sa-token-demo-websocket-spring & call mvn clean & cd .. cd .. diff --git a/pom.xml b/pom.xml index d7d71b4d..73074ff6 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ - 1.29.1.trial + 1.30.0.RC 1.8 utf-8 utf-8 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java index a6b09310..62765b86 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java @@ -26,12 +26,16 @@ public class SaFoxUtil { * 打印 Sa-Token 版本字符画 */ public static void printSaToken() { - String str = "____ ____ ___ ____ _ _ ____ _ _ \r\n" + "[__ |__| __ | | | |_/ |___ |\\ | \r\n" + String str = "" + + "____ ____ ___ ____ _ _ ____ _ _ \r\n" + + "[__ |__| __ | | | |_/ |___ |\\ | \r\n" + "___] | | | |__| | \\_ |___ | \\| " +// + SaTokenConsts.VERSION_NO // + "sa-token:" - + "\r\n" + "DevDoc:" + SaTokenConsts.DEV_DOC_URL // + "\r\n"; +// + "\r\n" + "DevDoc:" + SaTokenConsts.DEV_DOC_URL // + "\r\n"; + + "\r\n" + SaTokenConsts.DEV_DOC_URL // + "\r\n"; + " (" + SaTokenConsts.VERSION_NO + ")" - + "\r\n" + "GitHub:" + SaTokenConsts.GITHUB_URL // + "\r\n"; +// + "\r\n" + "GitHub:" + SaTokenConsts.GITHUB_URL // + "\r\n"; ; System.out.println(str); } 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 ba6a949f..c9d6d946 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,10 +13,15 @@ public class SaTokenConsts { /** * Sa-Token 当前版本号 */ - public static final String VERSION_NO = "v1.29.1.trial"; + public static final String VERSION_NO = "v1.30.0.RC"; /** - * Sa-Token 开源地址 + * Sa-Token 开源地址 Gitee + */ + public static final String GITEE_URL = "https://gitee.com/dromara/sa-token"; + + /** + * Sa-Token 开源地址 GitHub */ public static final String GITHUB_URL = "https://github.com/dromara/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 07cc08e0..aca5ab64 100644 --- a/sa-token-demo/sa-token-demo-alone-redis/pom.xml +++ b/sa-token-demo/sa-token-demo-alone-redis/pom.xml @@ -10,13 +10,13 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml index 2ff317e6..ebba72f6 100644 --- a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml @@ -16,7 +16,7 @@ 1.8 3.1.1 - 1.29.1.trial + 1.30.0.RC diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml index 79db2733..9ba7e59d 100644 --- a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml +++ b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml @@ -16,7 +16,7 @@ 1.8 3.1.1 - 1.29.1.trial + 1.30.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 0a21d69a..489e645d 100644 --- a/sa-token-demo/sa-token-demo-jwt/pom.xml +++ b/sa-token-demo/sa-token-demo-jwt/pom.xml @@ -10,13 +10,13 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC diff --git a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/SaTokenJwtDemoApplication.java b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/SaTokenJwtDemoApplication.java index fa383986..1207a2c1 100644 --- a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/SaTokenJwtDemoApplication.java +++ b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/SaTokenJwtDemoApplication.java @@ -10,7 +10,7 @@ public class SaTokenJwtDemoApplication { public static void main(String[] args) { SpringApplication.run(SaTokenJwtDemoApplication.class, args); - System.out.println("\n启动成功:Sa-Token配置如下:" + SaManager.getConfig()); + System.out.println("\n启动成功:Sa-Token配置如下:" + SaManager.getConfig()); } } \ No newline at end of file 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 b7f104a6..f3280320 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.29.1.trial + 1.30.0.RC 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 a8f7abce..ec4488a8 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.29.1.trial + 1.30.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 e9a96a44..9f951b93 100644 --- a/sa-token-demo/sa-token-demo-quick-login/pom.xml +++ b/sa-token-demo/sa-token-demo-quick-login/pom.xml @@ -10,13 +10,13 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml index 013e9482..6a69b4b0 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.29.1.trial + 1.30.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 eb238955..5c443d13 100644 --- a/sa-token-demo/sa-token-demo-springboot/pom.xml +++ b/sa-token-demo/sa-token-demo-springboot/pom.xml @@ -10,14 +10,14 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/current/NotFoundHandle.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/current/NotFoundHandle.java index 9aa99809..1e82e95a 100644 --- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/current/NotFoundHandle.java +++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/current/NotFoundHandle.java @@ -18,11 +18,6 @@ import cn.dev33.satoken.util.SaResult; @RestController public class NotFoundHandle implements ErrorController { - @Override - public String getErrorPath() { - return "/error"; - } - @RequestMapping("/error") public Object error(HttpServletRequest request, HttpServletResponse response) throws IOException { response.setStatus(200); diff --git a/sa-token-demo/sa-token-demo-sso-server/pom.xml b/sa-token-demo/sa-token-demo-sso-server/pom.xml index 3f9c467c..af57f8b0 100644 --- a/sa-token-demo/sa-token-demo-sso-server/pom.xml +++ b/sa-token-demo/sa-token-demo-sso-server/pom.xml @@ -10,13 +10,13 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC 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 70e0a4dd..f1a74e8d 100644 --- a/sa-token-demo/sa-token-demo-sso1-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso1-client/pom.xml @@ -10,13 +10,13 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC 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 944df1c7..dd655d54 100644 --- a/sa-token-demo/sa-token-demo-sso2-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso2-client/pom.xml @@ -10,13 +10,13 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC 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 afcfaf14..ee90d827 100644 --- a/sa-token-demo/sa-token-demo-sso3-client/pom.xml +++ b/sa-token-demo/sa-token-demo-sso3-client/pom.xml @@ -10,13 +10,13 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC diff --git a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml index 0881c03a..ec496107 100644 --- a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml +++ b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml @@ -10,13 +10,13 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.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 3c8f1049..2eac97eb 100644 --- a/sa-token-demo/sa-token-demo-webflux/pom.xml +++ b/sa-token-demo/sa-token-demo-webflux/pom.xml @@ -10,13 +10,13 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC diff --git a/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/DefineRoutes.java b/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/DefineRoutes.java index 11c8a6b3..729957f5 100644 --- a/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/DefineRoutes.java +++ b/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/DefineRoutes.java @@ -19,6 +19,7 @@ public class DefineRoutes { * 函数式编程,初始化路由表 * @return 路由表 */ + @SuppressWarnings("deprecation") @Bean public RouterFunction getRoutes() { return RouterFunctions.route(RequestPredicates.GET("/fun"), req -> { 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 13461073..08f862bc 100644 --- a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml +++ b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml @@ -10,14 +10,14 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.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 382f3a84..5ddbb0b5 100644 --- a/sa-token-demo/sa-token-demo-websocket/pom.xml +++ b/sa-token-demo/sa-token-demo-websocket/pom.xml @@ -10,14 +10,14 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.5.12 - 1.29.1.trial + 1.30.0.RC diff --git a/sa-token-doc/doc/README.md b/sa-token-doc/doc/README.md index 5dca19ba..98dd7a87 100644 --- a/sa-token-doc/doc/README.md +++ b/sa-token-doc/doc/README.md @@ -1,7 +1,7 @@

logo

-

Sa-Token v1.29.1.trial

+

Sa-Token v1.30.0.RC

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

diff --git a/sa-token-doc/doc/index.html b/sa-token-doc/doc/index.html index eeef2603..07b9130f 100644 --- a/sa-token-doc/doc/index.html +++ b/sa-token-doc/doc/index.html @@ -20,7 +20,7 @@

Sa-Token

- v1.29.1.trial + v1.30.0.RC
@@ -30,6 +30,7 @@