diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaAnnotationAbstractHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaAnnotationHandlerInterface.java similarity index 95% rename from sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaAnnotationAbstractHandler.java rename to sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaAnnotationHandlerInterface.java index 8db94fc9..fd91d396 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaAnnotationAbstractHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaAnnotationHandlerInterface.java @@ -24,7 +24,7 @@ import java.lang.reflect.Method; * @author click33 * @since 2024/8/2 */ -public interface SaAnnotationAbstractHandler { +public interface SaAnnotationHandlerInterface { /** * 获取所要处理的注解类型 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckDisableHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckDisableHandler.java index 67817621..d1faa35d 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckDisableHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckDisableHandler.java @@ -27,7 +27,7 @@ import java.lang.reflect.Method; * @author click33 * @since 2024/8/2 */ -public class SaCheckDisableHandler implements SaAnnotationAbstractHandler { +public class SaCheckDisableHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckHttpBasicHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckHttpBasicHandler.java index 2c809b60..7e15ce6b 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckHttpBasicHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckHttpBasicHandler.java @@ -26,7 +26,7 @@ import java.lang.reflect.Method; * @author click33 * @since 2024/8/2 */ -public class SaCheckHttpBasicHandler implements SaAnnotationAbstractHandler { +public class SaCheckHttpBasicHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckHttpDigestHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckHttpDigestHandler.java index 1a688492..1829ce81 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckHttpDigestHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckHttpDigestHandler.java @@ -28,7 +28,7 @@ import java.lang.reflect.Method; * @author click33 * @since 2024/8/2 */ -public class SaCheckHttpDigestHandler implements SaAnnotationAbstractHandler { +public class SaCheckHttpDigestHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckLoginHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckLoginHandler.java index ab83f39e..d549763a 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckLoginHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckLoginHandler.java @@ -27,7 +27,7 @@ import java.lang.reflect.Method; * @author click33 * @since 2024/8/2 */ -public class SaCheckLoginHandler implements SaAnnotationAbstractHandler { +public class SaCheckLoginHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckOrHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckOrHandler.java index 3aafbfb5..bb7b9c1d 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckOrHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckOrHandler.java @@ -31,7 +31,7 @@ import java.util.List; * @author click33 * @since 2024/8/2 */ -public class SaCheckOrHandler implements SaAnnotationAbstractHandler { +public class SaCheckOrHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckPermissionHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckPermissionHandler.java index 64e79b01..62321098 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckPermissionHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckPermissionHandler.java @@ -30,7 +30,7 @@ import java.lang.reflect.Method; * @author click33 * @since 2024/8/2 */ -public class SaCheckPermissionHandler implements SaAnnotationAbstractHandler { +public class SaCheckPermissionHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckRoleHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckRoleHandler.java index e5c88b14..f5297a3d 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckRoleHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckRoleHandler.java @@ -28,7 +28,7 @@ import java.lang.reflect.Method; * @author click33 * @since 2024/8/2 */ -public class SaCheckRoleHandler implements SaAnnotationAbstractHandler { +public class SaCheckRoleHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckSafeHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckSafeHandler.java index b07358b1..c4052385 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckSafeHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaCheckSafeHandler.java @@ -27,7 +27,7 @@ import java.lang.reflect.Method; * @author click33 * @since 2024/8/2 */ -public class SaCheckSafeHandler implements SaAnnotationAbstractHandler { +public class SaCheckSafeHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaIgnoreHandler.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaIgnoreHandler.java index 93319cd4..1fdef904 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaIgnoreHandler.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/handler/SaIgnoreHandler.java @@ -26,7 +26,7 @@ import java.lang.reflect.Method; * @author click33 * @since 2024/8/2 */ -public class SaIgnoreHandler implements SaAnnotationAbstractHandler { +public class SaIgnoreHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java index 29ed5d89..53c18dd8 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java @@ -18,7 +18,7 @@ package cn.dev33.satoken.listener; import java.util.ArrayList; import java.util.List; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.error.SaErrorCode; import cn.dev33.satoken.exception.SaTokenException; @@ -292,7 +292,7 @@ public class SaTokenEventCenter { * 事件发布：有新的注解处理器载入到框架中 * @param handler 注解处理器 */ - public static void doRegisterAnnotationHandler(SaAnnotationAbstractHandler handler) { + public static void doRegisterAnnotationHandler(SaAnnotationHandlerInterface handler) { for (SaTokenListener listener : listenerList) { listener.doRegisterAnnotationHandler(handler); } diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java index 6a4e3564..1d867f2c 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java @@ -15,7 +15,7 @@ */ package cn.dev33.satoken.listener; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpLogic; @@ -130,7 +130,7 @@ public interface SaTokenListener { * 注册了自定义注解处理器 * @param handler 注解处理器 */ - default void doRegisterAnnotationHandler(SaAnnotationAbstractHandler handler) {} + default void doRegisterAnnotationHandler(SaAnnotationHandlerInterface handler) {} /** * StpLogic 对象替换 diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java index 7bb32ef4..c1b61118 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java @@ -15,7 +15,7 @@ */ package cn.dev33.satoken.listener; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpLogic; @@ -136,7 +136,7 @@ public class SaTokenListenerForLog implements SaTokenListener { * @param handler 注解处理器 */ @Override - public void doRegisterAnnotationHandler(SaAnnotationAbstractHandler handler) { + public void doRegisterAnnotationHandler(SaAnnotationHandlerInterface handler) { if(handler != null) { log.info("注解扩展 @{} (处理器: {})", handler.getHandlerAnnotationClass().getSimpleName(), handler.getClass().getCanonicalName()); } diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaAnnotationStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaAnnotationStrategy.java index 9c8b88ba..e0ffc23a 100644 --- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaAnnotationStrategy.java +++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaAnnotationStrategy.java @@ -49,7 +49,7 @@ public final class SaAnnotationStrategy { /** * 注解处理器集合 */ - public Map, SaAnnotationAbstractHandler> annotationHandlerMap = new LinkedHashMap<>(); + public Map, SaAnnotationHandlerInterface> annotationHandlerMap = new LinkedHashMap<>(); /** * 注册所有默认的注解处理器 @@ -69,7 +69,7 @@ public final class SaAnnotationStrategy { /** * 注册一个注解处理器 */ - public void registerAnnotationHandler(SaAnnotationAbstractHandler handler) { + public void registerAnnotationHandler(SaAnnotationHandlerInterface handler) { annotationHandlerMap.put(handler.getHandlerAnnotationClass(), handler); SaTokenEventCenter.doRegisterAnnotationHandler(handler); } @@ -77,8 +77,8 @@ public final class SaAnnotationStrategy { /** * 注册一个注解处理器，到首位 */ - public void registerAnnotationHandlerToFirst(SaAnnotationAbstractHandler handler) { - Map, SaAnnotationAbstractHandler> newMap = new LinkedHashMap<>(); + public void registerAnnotationHandlerToFirst(SaAnnotationHandlerInterface handler) { + Map, SaAnnotationHandlerInterface> newMap = new LinkedHashMap<>(); newMap.put(handler.getHandlerAnnotationClass(), handler); newMap.putAll(annotationHandlerMap); this.annotationHandlerMap = newMap; @@ -98,7 +98,7 @@ public final class SaAnnotationStrategy { @SuppressWarnings("unchecked") public SaCheckMethodAnnotationFunction checkMethodAnnotation = (method) -> { // 遍历所有的注解处理器，检查此 method 是否具有这些指定的注解 - for (Map.Entry, SaAnnotationAbstractHandler> entry: annotationHandlerMap.entrySet()) { + for (Map.Entry, SaAnnotationHandlerInterface> entry: annotationHandlerMap.entrySet()) { // 先校验 Method 所属 Class 上的注解 Annotation classTakeAnnotation = instance.getAnnotation.apply(method.getDeclaringClass(), (Class)entry.getKey()); diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/CheckAccountHandler.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/CheckAccountHandler.java index 96cb659e..2b49badf 100644 --- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/CheckAccountHandler.java +++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/CheckAccountHandler.java @@ -1,6 +1,6 @@ package com.pj.satoken.custom_annotation.handler; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.exception.SaTokenException; import com.pj.satoken.custom_annotation.CheckAccount; @@ -15,7 +15,7 @@ import java.lang.reflect.Method; * */ @Component -public class CheckAccountHandler implements SaAnnotationAbstractHandler { +public class CheckAccountHandler implements SaAnnotationHandlerInterface { // 指定这个处理器要处理哪个注解 @Override diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckLoginHandler.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckLoginHandler.java index 46401f9e..73c51865 100644 --- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckLoginHandler.java +++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckLoginHandler.java @@ -1,6 +1,6 @@ package com.pj.satoken.custom_annotation.handler; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.annotation.handler.SaCheckLoginHandler; import com.pj.satoken.StpUserUtil; import com.pj.satoken.custom_annotation.SaUserCheckLogin; @@ -14,7 +14,7 @@ import java.lang.reflect.Method; * @author click33 */ @Component -public class SaUserCheckLoginHandler implements SaAnnotationAbstractHandler { +public class SaUserCheckLoginHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckPermissionHandler.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckPermissionHandler.java index 9759d884..35ef3a44 100644 --- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckPermissionHandler.java +++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckPermissionHandler.java @@ -1,6 +1,6 @@ package com.pj.satoken.custom_annotation.handler; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.annotation.handler.SaCheckPermissionHandler; import com.pj.satoken.StpUserUtil; import com.pj.satoken.custom_annotation.SaUserCheckPermission; @@ -14,7 +14,7 @@ import java.lang.reflect.Method; * @author click33 */ @Component -public class SaUserCheckPermissionHandler implements SaAnnotationAbstractHandler { +public class SaUserCheckPermissionHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckRoleHandler.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckRoleHandler.java index 633a756b..c430fb1e 100644 --- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckRoleHandler.java +++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckRoleHandler.java @@ -1,6 +1,6 @@ package com.pj.satoken.custom_annotation.handler; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.annotation.handler.SaCheckRoleHandler; import com.pj.satoken.StpUserUtil; import com.pj.satoken.custom_annotation.SaUserCheckRole; @@ -14,7 +14,7 @@ import java.lang.reflect.Method; * @author click33 */ @Component -public class SaUserCheckRoleHandler implements SaAnnotationAbstractHandler { +public class SaUserCheckRoleHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckSafeHandler.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckSafeHandler.java index 8c046506..88504e06 100644 --- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckSafeHandler.java +++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/custom_annotation/handler/SaUserCheckSafeHandler.java @@ -1,6 +1,6 @@ package com.pj.satoken.custom_annotation.handler; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.annotation.handler.SaCheckSafeHandler; import com.pj.satoken.StpUserUtil; import com.pj.satoken.custom_annotation.SaUserCheckSafe; @@ -14,7 +14,7 @@ import java.lang.reflect.Method; * @author click33 */ @Component -public class SaUserCheckSafeHandler implements SaAnnotationAbstractHandler { +public class SaUserCheckSafeHandler implements SaAnnotationHandlerInterface { @Override public Class getHandlerAnnotationClass() { diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/custom_annotation/handler/CheckAccountHandler.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/custom_annotation/handler/CheckAccountHandler.java index f7f9c6e6..e7c608f2 100644 --- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/custom_annotation/handler/CheckAccountHandler.java +++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/custom_annotation/handler/CheckAccountHandler.java @@ -1,6 +1,6 @@ package com.pj.satoken.custom_annotation.handler; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.exception.SaTokenException; import com.pj.satoken.custom_annotation.CheckAccount; @@ -15,7 +15,7 @@ import java.lang.reflect.Method; * */ @Component -public class CheckAccountHandler implements SaAnnotationAbstractHandler { +public class CheckAccountHandler implements SaAnnotationHandlerInterface { // 指定这个处理器要处理哪个注解 @Override diff --git a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaAopPointcutAdvisorBeanRegister.java b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaAopPointcutAdvisorBeanRegister.java index d379ebdd..8fe1a649 100644 --- a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaAopPointcutAdvisorBeanRegister.java +++ b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaAopPointcutAdvisorBeanRegister.java @@ -1,6 +1,6 @@ package cn.dev33.satoken.aop; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.strategy.SaAnnotationStrategy; import org.springframework.aop.aspectj.AspectJExpressionPointcut; import org.springframework.context.annotation.Bean; @@ -30,7 +30,7 @@ public class SaAopPointcutAdvisorBeanRegister { public static SaAroundAnnotationPointcutAdvisor saAroundAnnoAdvisor; @Bean - public SaAroundAnnotationPointcutAdvisor saAroundAnnotationHandlePointcutAdvisor (List> handlerList) { + public SaAroundAnnotationPointcutAdvisor saAroundAnnotationHandlePointcutAdvisor (List> handlerList) { SaAroundAnnotationPointcutAdvisor advisor = new SaAroundAnnotationPointcutAdvisor(); // 定义切入规则 @@ -52,14 +52,14 @@ public class SaAopPointcutAdvisorBeanRegister { * @param appendHandlerList 追加的 SaAnnotationAbstractHandler 处理器 * @return / */ - public static String calcExpression(List> appendHandlerList) { + public static String calcExpression(List> appendHandlerList) { // 框架内置的 List> list = new ArrayList<>(SaAnnotationStrategy.instance.annotationHandlerMap.keySet()); // 额外追加的 if(appendHandlerList != null) { - for (SaAnnotationAbstractHandler handler : appendHandlerList) { + for (SaAnnotationHandlerInterface handler : appendHandlerList) { Class cls = handler.getHandlerAnnotationClass(); if(!list.contains(cls)) { list.add(handler.getHandlerAnnotationClass()); diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java index bbff6026..a6bb293e 100644 --- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java +++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java @@ -16,7 +16,7 @@ package cn.dev33.satoken.solon; import cn.dev33.satoken.SaManager; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.context.second.SaTokenSecondContextCreator; import cn.dev33.satoken.dao.SaTokenDao; @@ -98,7 +98,7 @@ public class XPluginImp implements Plugin { }); // 注入自定义注解处理器 Bean （可以有多个） - context.subBeansOfType(SaAnnotationAbstractHandler.class, sl -> { + context.subBeansOfType(SaAnnotationHandlerInterface.class, sl -> { SaAnnotationStrategy.instance.registerAnnotationHandler(sl); }); diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java index 69d4777e..ce9ff0d3 100644 --- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java +++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java @@ -16,7 +16,7 @@ package cn.dev33.satoken.spring; import cn.dev33.satoken.SaManager; -import cn.dev33.satoken.annotation.handler.SaAnnotationAbstractHandler; +import cn.dev33.satoken.annotation.handler.SaAnnotationHandlerInterface; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.context.SaTokenContext; import cn.dev33.satoken.context.second.SaTokenSecondContextCreator; @@ -126,8 +126,8 @@ public class SaBeanInject { * @param handlerList 自定义注解处理器集合 */ @Autowired(required = false) - public void setSaAnnotationHandler(List> handlerList) { - for (SaAnnotationAbstractHandler handler : handlerList) { + public void setSaAnnotationHandler(List> handlerList) { + for (SaAnnotationHandlerInterface handler : handlerList) { SaAnnotationStrategy.instance.registerAnnotationHandler(handler); } }