From 27b4e31061c25a63855aefef0b939f2717b056e5 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Tue, 16 May 2023 15:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-spring-boot3-star?= =?UTF-8?q?ter=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reactor/filter/SaReactorFilter.java | 22 +++++++++---------- .../reactor/model/SaRequestForReactor.java | 2 +- .../dev33/satoken/reactor/package-info.java | 6 ++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java index 7b695772..103dd412 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java +++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java @@ -15,19 +15,10 @@ */ package cn.dev33.satoken.reactor.filter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import cn.dev33.satoken.filter.SaFilter; -import org.springframework.core.annotation.Order; -import org.springframework.web.server.ServerWebExchange; -import org.springframework.web.server.WebFilter; -import org.springframework.web.server.WebFilterChain; - import cn.dev33.satoken.exception.BackResultException; import cn.dev33.satoken.exception.SaTokenException; import cn.dev33.satoken.exception.StopMatchException; +import cn.dev33.satoken.filter.SaFilter; import cn.dev33.satoken.filter.SaFilterAuthStrategy; import cn.dev33.satoken.filter.SaFilterErrorStrategy; import cn.dev33.satoken.reactor.context.SaReactorHolder; @@ -35,8 +26,16 @@ import cn.dev33.satoken.reactor.context.SaReactorSyncHolder; import cn.dev33.satoken.reactor.error.SaReactorSpringBootErrorCode; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.util.SaTokenConsts; +import org.springframework.core.annotation.Order; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebFilter; +import org.springframework.web.server.WebFilterChain; import reactor.core.publisher.Mono; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** * Reactor 全局鉴权过滤器 *

@@ -145,7 +144,8 @@ public class SaReactorFilter implements SaFilter, WebFilter { }); } catch (StopMatchException e) { - + // StopMatchException 异常代表:停止匹配,进入Controller + } catch (Throwable e) { // 1. 获取异常处理策略结果 String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e)); diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java index 9ef75437..c3c936e9 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java +++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java @@ -121,7 +121,7 @@ public class SaRequestForReactor implements SaRequest { */ public String getUrl() { String currDomain = SaManager.getConfig().getCurrDomain(); - if(SaFoxUtil.isEmpty(currDomain) == false) { + if( ! SaFoxUtil.isEmpty(currDomain)) { return currDomain + this.getRequestPath(); } return request.getURI().toString(); diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java index a3561acf..df78335d 100644 --- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java +++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java @@ -1,6 +1,3 @@ -/** - * sa-token集成Reactor响应式编程的各个组件 - */ /* * Copyright 2020-2099 sa-token.cc * @@ -16,4 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** + * Sa-Token 集成 Reactor 响应式编程的各个组件 + */ package cn.dev33.satoken.reactor; \ No newline at end of file