From 434803de2e2604ba3f4157d35905f03c921400d8 Mon Sep 17 00:00:00 2001 From: click33 <2393584716@qq.com> Date: Sun, 21 Aug 2022 07:12:20 +0800 Subject: [PATCH] =?UTF-8?q?SaAnnotationInterceptor=20=E4=B8=8E=20SaRouteIn?= =?UTF-8?q?terceptor=20=E6=A0=87=E6=B3=A8=E4=B8=BA=E8=BF=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/pj/satoken/SaTokenConfigure.java | 10 +++++----- .../src/main/java/com/pj/satoken/SaTokenConfigure.java | 8 ++++---- .../src/main/java/com/pj/satoken/SaTokenConfigure.java | 8 ++++---- .../satoken/interceptor/SaAnnotationInterceptor.java | 5 +++-- .../dev33/satoken/interceptor/SaRouteInterceptor.java | 3 ++- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/satoken/SaTokenConfigure.java index b4069300..29a77d96 100644 --- a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/satoken/SaTokenConfigure.java +++ b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/satoken/SaTokenConfigure.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import cn.dev33.satoken.interceptor.SaAnnotationInterceptor; +import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpLogic; @@ -17,14 +17,14 @@ import cn.dev33.satoken.stp.StpLogic; */ @Configuration public class SaTokenConfigure implements WebMvcConfigurer { - + /** - * 注册Sa-Token 的拦截器，打开注解式鉴权功能 + * 注册 Sa-Token 拦截器打开注解鉴权功能 */ @Override public void addInterceptors(InterceptorRegistry registry) { - // 注册注解拦截器 - registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**"); + // 注册 Sa-Token 拦截器打开注解鉴权功能 + registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**"); } /** diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java index 5f3212e7..50358e17 100644 --- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java +++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java @@ -11,7 +11,7 @@ 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.interceptor.SaInterceptor; import cn.dev33.satoken.strategy.SaStrategy; @@ -24,12 +24,12 @@ import cn.dev33.satoken.strategy.SaStrategy; public class SaTokenConfigure implements WebMvcConfigurer { /** - * 注册Sa-Token 的拦截器，打开注解式鉴权功能 + * 注册 Sa-Token 拦截器打开注解鉴权功能 */ @Override public void addInterceptors(InterceptorRegistry registry) { - // 注册注解拦截器 - registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**"); + // 注册 Sa-Token 拦截器打开注解鉴权功能 + registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**"); } /** 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 5f3212e7..50358e17 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 @@ -11,7 +11,7 @@ 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.interceptor.SaInterceptor; import cn.dev33.satoken.strategy.SaStrategy; @@ -24,12 +24,12 @@ import cn.dev33.satoken.strategy.SaStrategy; public class SaTokenConfigure implements WebMvcConfigurer { /** - * 注册Sa-Token 的拦截器，打开注解式鉴权功能 + * 注册 Sa-Token 拦截器打开注解鉴权功能 */ @Override public void addInterceptors(InterceptorRegistry registry) { - // 注册注解拦截器 - registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**"); + // 注册 Sa-Token 拦截器打开注解鉴权功能 + registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**"); } /** diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaAnnotationInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaAnnotationInterceptor.java index 28ebc964..a4a1d9bc 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaAnnotationInterceptor.java +++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaAnnotationInterceptor.java @@ -11,10 +11,11 @@ import org.springframework.web.servlet.HandlerInterceptor; import cn.dev33.satoken.strategy.SaStrategy; /** - * 注解式鉴权 - 拦截器 + * Sa-Token 注解式鉴权 - 拦截器 * * @author kong */ +@Deprecated public class SaAnnotationInterceptor implements HandlerInterceptor { /** @@ -30,7 +31,7 @@ public class SaAnnotationInterceptor implements HandlerInterceptor { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - // 获取处理method + // 获取处理 Method if (handler instanceof HandlerMethod == false) { return true; } diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouteInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouteInterceptor.java index 8ec0941c..385566b2 100644 --- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouteInterceptor.java +++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaRouteInterceptor.java @@ -13,9 +13,10 @@ import cn.dev33.satoken.servlet.model.SaResponseForServlet; import cn.dev33.satoken.stp.StpUtil; /** - * sa-token基于路由的拦截式鉴权 + * Sa-Token 拦截式鉴权 - 拦截器 * @author kong */ +@Deprecated public class SaRouteInterceptor implements HandlerInterceptor { /**