From 041294e79024c3da337cc3a4d57f167a0765364d Mon Sep 17 00:00:00 2001 From: shengzhang <2393584716@qq.com> Date: Mon, 10 May 2021 01:29:56 +0800 Subject: [PATCH] =?UTF-8?q?v1.19.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 +- mvn clean.bat | 4 ++++ pom.xml | 4 ++-- sa-token-core/pom.xml | 2 +- .../java/cn/dev33/satoken/fun/SaFunction.java | 1 + .../dev33/satoken/router/SaRouteFunction.java | 1 + .../cn/dev33/satoken/util/SaTokenConsts.java | 2 +- sa-token-demo/sa-token-demo-jwt/pom.xml | 2 +- sa-token-demo/sa-token-demo-quick-login/pom.xml | 2 +- .../com/pj/SaTokenQuickDemoApplication.java | 2 -- sa-token-demo/sa-token-demo-springboot/pom.xml | 2 +- .../java/com/pj/satoken/SaTokenConfigure.java | 5 ++--- sa-token-demo/sa-token-demo-webflux/pom.xml | 2 +- sa-token-doc/doc/README.md | 2 +- sa-token-doc/doc/_sidebar.md | 2 +- sa-token-doc/doc/index.html | 2 +- sa-token-doc/doc/more/update-log.md | 8 ++++++++ sa-token-doc/doc/plugin/aop-at.md | 2 +- sa-token-doc/doc/plugin/quick-login.md | 17 +++++------------ 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-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-starter/pom.xml | 2 +- .../pom.xml | 2 +- sa-token-starter/sa-token-servlet/pom.xml | 2 +- .../sa-token-spring-boot-starter/pom.xml | 2 +- 34 files changed, 57 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 244158f6..dd4f01ff 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

logo

-

sa-token v1.18.0

+

sa-token v1.19.0

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

diff --git a/mvn clean.bat b/mvn clean.bat index 8d9f857c..74f08ac4 100644 --- a/mvn clean.bat +++ b/mvn clean.bat @@ -25,6 +25,10 @@ cd sa-token-demo-oauth2-server call mvn clean cd .. +cd sa-token-demo-quick-login +call mvn clean +cd .. + cd .. :: 最后打印 diff --git a/pom.xml b/pom.xml index b96f3764..175d57b7 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.dev33 sa-token-parent pom - 1.18.0 + 1.19.0 sa-token @@ -36,7 +36,7 @@ - 1.18.0 + 1.19.0 1.8 utf-8 utf-8 diff --git a/sa-token-core/pom.xml b/sa-token-core/pom.xml index 0c27a53c..2569ea64 100644 --- a/sa-token-core/pom.xml +++ b/sa-token-core/pom.xml @@ -7,7 +7,7 @@ cn.dev33 sa-token-parent - 1.18.0 + 1.19.0 jar diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java index 6b0d2190..e8ad5e5d 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java @@ -6,6 +6,7 @@ package cn.dev33.satoken.fun; * @author kong * */ +@FunctionalInterface public interface SaFunction { /** diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouteFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouteFunction.java index 74348cea..cf644f2b 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouteFunction.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouteFunction.java @@ -9,6 +9,7 @@ import cn.dev33.satoken.context.model.SaResponse; * @author kong * */ +@FunctionalInterface public interface SaRouteFunction { /** 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 9ded4c56..9000291e 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.18.0"; + public static final String VERSION_NO = "v1.19.0"; /** * sa-token 开源地址 diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml index 208af28a..1a0e1090 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.18.0 + 1.19.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 991a067c..404a9937 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.18.0 + 1.19.0 diff --git a/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/SaTokenQuickDemoApplication.java b/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/SaTokenQuickDemoApplication.java index fedb35d0..b0d0b1c2 100644 --- a/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/SaTokenQuickDemoApplication.java +++ b/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/SaTokenQuickDemoApplication.java @@ -2,10 +2,8 @@ package com.pj; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Configuration; @SpringBootApplication -@Configuration public class SaTokenQuickDemoApplication { public static void main(String[] args) { diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml index 80b377d2..991dca39 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.18.0 + 1.19.0 diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java index 1d59ebb8..5bc029dd 100644 --- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java +++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java @@ -10,7 +10,6 @@ import com.pj.util.AjaxJson; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.filter.SaServletFilter; import cn.dev33.satoken.interceptor.SaAnnotationInterceptor; -import cn.dev33.satoken.router.SaRouterUtil; /** @@ -42,9 +41,9 @@ public class SaTokenConfigure implements WebMvcConfigurer { // 认证函数: 每次请求执行 .setAuth(r -> { - System.out.println("---------- sa全局认证"); + // System.out.println("---------- sa全局认证"); - SaRouterUtil.match("/test/test", () -> new Object()); + // SaRouterUtil.match("/test/test", () -> new Object()); }) // 异常处理函数：每次认证函数发生异常时执行此函数 diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml index b1a1c271..fba28c01 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.18.0 + 1.19.0 diff --git a/sa-token-doc/doc/README.md b/sa-token-doc/doc/README.md index 72327722..3270efa6 100644 --- a/sa-token-doc/doc/README.md +++ b/sa-token-doc/doc/README.md @@ -1,7 +1,7 @@

logo

-

sa-token v1.18.0

+

sa-token v1.19.0

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

diff --git a/sa-token-doc/doc/_sidebar.md b/sa-token-doc/doc/_sidebar.md index b6772439..3cce4b41 100644 --- a/sa-token-doc/doc/_sidebar.md +++ b/sa-token-doc/doc/_sidebar.md @@ -49,7 +49,7 @@ - [Session模型详解](/fun/session-model) - [TokenInfo参数详解](/fun/token-info) - [框架源码所有技术栈](/fun/tech-stack) - - [Web开发常见漏洞防护](/fun/web-loophole) + diff --git a/sa-token-doc/doc/index.html b/sa-token-doc/doc/index.html index df23d3a9..99207ba6 100644 --- a/sa-token-doc/doc/index.html +++ b/sa-token-doc/doc/index.html @@ -48,7 +48,7 @@