From dadcc93c1dea55f656bfdf3d42f00b3fcdc9d3bb Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Tue, 16 May 2023 12:50:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-spring-boot-start?= =?UTF-8?q?er=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 --- .../dev33/satoken/filter/SaServletFilter.java | 5 +++-- .../satoken/interceptor/SaInterceptor.java | 17 ++++++++--------- .../java/cn/dev33/satoken/package-info.java | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java index e1109774..bf01c436 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java +++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java @@ -137,7 +137,8 @@ public class SaServletFilter implements SaFilter, Filter { }); } catch (StopMatchException e) { - + // StopMatchException 异常代表:停止匹配,进入Controller + } catch (Throwable e) { // 1. 获取异常处理策略结果 String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e)); @@ -157,7 +158,7 @@ public class SaServletFilter implements SaFilter, Filter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { } @Override diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java index 3a599be6..05b02d9b 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java +++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java @@ -15,19 +15,17 @@ */ package cn.dev33.satoken.interceptor; -import java.lang.reflect.Method; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.HandlerInterceptor; - import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.exception.BackResultException; import cn.dev33.satoken.exception.StopMatchException; import cn.dev33.satoken.fun.SaParamFunction; import cn.dev33.satoken.strategy.SaStrategy; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.lang.reflect.Method; /** * Sa-Token 综合拦截器,提供注解鉴权和路由拦截鉴权能力 @@ -89,9 +87,10 @@ public class SaInterceptor implements HandlerInterceptor { * 每次请求之前触发的方法 */ @Override + @SuppressWarnings("all") public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - + try { // 这里必须确保 handler 是 HandlerMethod 类型时,才能进行注解鉴权 diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java index 4cae80b8..963c21c3 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java +++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java @@ -1,6 +1,3 @@ -/** - * sa-token集成SpringBoot的各个组件 - */ /* * 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 集成 SpringBoot 的各个组件 + */ package cn.dev33.satoken; \ No newline at end of file