chore: 更新租户忽略注解

continew-org · Dec 25, 2024 · 192cecd · 192cecd
1 parent 88d1102
commit 192cecd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...nt/annotation/TenantDataSourceIgnore.java → ...nsion/tenant/annotation/TenantIgnore.java b/...nt/annotation/TenantDataSourceIgnore.java → ...nsion/tenant/annotation/TenantIgnore.java
@@ -27,5 +27,5 @@
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface TenantDataSourceIgnore {
+public @interface TenantIgnore {
 }
diff --git a/.../src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantInterceptor.java b/.../src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantInterceptor.java
@@ -19,7 +19,9 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.core.Ordered;
+import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
+import top.continew.starter.extension.tenant.annotation.TenantIgnore;
 import top.continew.starter.extension.tenant.config.TenantProvider;
 import top.continew.starter.extension.tenant.context.TenantContextHolder;
 
@@ -41,6 +43,13 @@ public TenantInterceptor(TenantProperties tenantProperties, TenantProvider tenan
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        if (handler instanceof HandlerMethod) {
+            HandlerMethod handlerMethod = (HandlerMethod)handler;
+            TenantIgnore customAnnotation = handlerMethod.getMethodAnnotation(TenantIgnore.class);
+            if (customAnnotation != null) {
+                return true;
+            }
+        }
         String tenantId = request.getHeader(tenantProperties.getTenantIdHeader());
         TenantContextHolder.setContext(tenantProvider.getByTenantId(tenantId, true));
         return true;

diff --git a/...ava/top/continew/starter/extension/tenant/handler/datasource/TenantDataSourceAdvisor.java b/...ava/top/continew/starter/extension/tenant/handler/datasource/TenantDataSourceAdvisor.java
@@ -67,7 +67,7 @@ private Pointcut buildPointcut() {
         AspectJExpressionPointcut cut = new AspectJExpressionPointcut();
         cut.setExpression("""
             execution(* *..controller..*(..))
-            && !@annotation(top.continew.starter.extension.tenant.annotation.TenantDataSourceIgnore)
+            && !@annotation(top.continew.starter.extension.tenant.annotation.TenantIgnore)
             """);
         return new ComposablePointcut((Pointcut)cut);
     }