diff --git a/sa-token-doc/doc/more/link.md b/sa-token-doc/doc/more/link.md index fb560065..d1c688a4 100644 --- a/sa-token-doc/doc/more/link.md +++ b/sa-token-doc/doc/more/link.md @@ -76,7 +76,7 @@ - [[ chaos ]](https://gitee.com/qishanor/chaos):一个基于 SpringBoot + Sa-Token + Mybatis-Plus的快速开发框架,前端vue-element-avue,内置代码生成器,代码最简洁,最佳学习实践方案。 -- [[ Pig-Satoken ]](https://gitee.com/wchenyang/cloud-satoken):重写Pig授权方式为Satoken,其他代码不变 +- [[ Pig-Satoken ]](https://gitee.com/wchenyang/cloud-satoken):重写 Pig 授权方式为 Sa-Token,其他代码不变。 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 a4a1d9bc..afa7fa3b 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 @@ -12,6 +12,7 @@ import cn.dev33.satoken.strategy.SaStrategy; /** * Sa-Token 注解式鉴权 - 拦截器 + *

[ 当前拦截器写法已过期,可能将在以后的版本删除,推荐升级为 SaInterceptor ]

* * @author kong */ 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 af60c0d7..c1836c82 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 @@ -79,8 +79,9 @@ public class SaInterceptor implements HandlerInterceptor { try { - // 获取此请求对应的 Method 处理函数 - if(handler instanceof HandlerMethod) { + if(isAnnotation && handler instanceof HandlerMethod) { + + // 获取此请求对应的 Method 处理函数 Method method = ((HandlerMethod) handler).getMethod(); // 如果此 Method 或其所属 Class 标注了 @SaIgnore,则忽略掉鉴权 @@ -89,9 +90,7 @@ public class SaInterceptor implements HandlerInterceptor { } // 注解校验 - if(isAnnotation) { - SaStrategy.me.checkMethodAnnotation.accept(method); - } + SaStrategy.me.checkMethodAnnotation.accept(method); } // Auth 校验 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 385566b2..4ce53f11 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,7 +13,9 @@ import cn.dev33.satoken.servlet.model.SaResponseForServlet; import cn.dev33.satoken.stp.StpUtil; /** - * Sa-Token 拦截式鉴权 - 拦截器 + * Sa-Token 拦截式鉴权 - 拦截器 + *

[ 当前拦截器写法已过期,可能将在以后的版本删除,推荐升级为 SaInterceptor ]

+ * * @author kong */ @Deprecated