fix(extension/tenant): 修复部分错误

continew-org · Dec 24, 2024 · 88d1102 · 88d1102
1 parent c5cb203
commit 88d1102
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/...enant-core/src/main/java/top/continew/starter/extension/tenant/config/TenantProvider.java b/...enant-core/src/main/java/top/continew/starter/extension/tenant/config/TenantProvider.java
@@ -22,6 +22,7 @@
  * 租户提供者
  *
  * @author Charles7c
+ * @author 小熊
  * @since 2.7.0
  */
 public interface TenantProvider {

diff --git a/...ain/java/top/continew/starter/extension/tenant/autoconfigure/TenantAutoConfiguration.java b/...ain/java/top/continew/starter/extension/tenant/autoconfigure/TenantAutoConfiguration.java
@@ -54,7 +54,7 @@ public class TenantAutoConfiguration {
     private static final Logger log = LoggerFactory.getLogger(TenantAutoConfiguration.class);
     private final TenantProperties tenantProperties;
 
-    private TenantAutoConfiguration(TenantProperties tenantProperties) {
+    public TenantAutoConfiguration(TenantProperties tenantProperties) {
         this.tenantProperties = tenantProperties;
     }
 

diff --git a/...ava/top/continew/starter/extension/tenant/handler/datasource/TenantDataSourceAdvisor.java b/...ava/top/continew/starter/extension/tenant/handler/datasource/TenantDataSourceAdvisor.java
@@ -65,7 +65,10 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
      */
     private Pointcut buildPointcut() {
         AspectJExpressionPointcut cut = new AspectJExpressionPointcut();
-        cut.setExpression("execution(* *..controller..*(..))");
+        cut.setExpression("""
+            execution(* *..controller..*(..))
+            && !@annotation(top.continew.starter.extension.tenant.annotation.TenantDataSourceIgnore)
+            """);
         return new ComposablePointcut((Pointcut)cut);
     }
 }
diff --git a/...ain/java/top/continew/starter/extension/tenant/handler/line/DefaultTenantLineHandler.java b/...ain/java/top/continew/starter/extension/tenant/handler/line/DefaultTenantLineHandler.java
@@ -55,8 +55,10 @@ public String getTenantIdColumn() {
     @Override
     public boolean ignoreTable(String tableName) {
         Long tenantId = TenantContextHolder.getTenantId();
-        if ((null != tenantId && tenantId.equals(tenantProperties
-            .getSuperTenantId())) || TenantIsolationLevel.DATASOURCE.equals(TenantContextHolder.getIsolationLevel())) {
+        if (null != tenantId && tenantId.equals(tenantProperties.getSuperTenantId())) {
+            return true;
+        }
+        if (TenantIsolationLevel.DATASOURCE.equals(TenantContextHolder.getIsolationLevel())) {
             return true;
         }
         return CollUtil.contains(tenantProperties.getIgnoreTables(), tableName);