From ac01adfffedee777788f7d3c8d5f22bcba65bbbe Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 22 八月 2024 18:47:58 +0800
Subject: [PATCH] ds
---
iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/config/IailabTenantAutoConfiguration.java | 15 +++++++++++++++
iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/core/service/TenantFrameworkServiceImpl.java | 6 +++---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/config/IailabTenantAutoConfiguration.java b/iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/config/IailabTenantAutoConfiguration.java
index 285c740..14060f8 100644
--- a/iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/config/IailabTenantAutoConfiguration.java
+++ b/iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/config/IailabTenantAutoConfiguration.java
@@ -1,10 +1,13 @@
package com.iailab.framework.tenant.config;
+import com.baomidou.dynamic.datasource.processor.DsProcessor;
+import com.baomidou.dynamic.datasource.processor.DsSpelExpressionProcessor;
import com.iailab.framework.common.enums.WebFilterOrderEnum;
import com.iailab.framework.mybatis.core.util.MyBatisUtils;
import com.iailab.framework.redis.config.IailabCacheProperties;
import com.iailab.framework.tenant.core.aop.TenantIgnoreAspect;
import com.iailab.framework.tenant.core.db.TenantDatabaseInterceptor;
+import com.iailab.framework.tenant.core.db.dynamic.TenantDsProcessor;
import com.iailab.framework.tenant.core.job.TenantJobAspect;
import com.iailab.framework.tenant.core.mq.rabbitmq.TenantRabbitMQInitializer;
import com.iailab.framework.tenant.core.mq.redis.TenantRedisMessageInterceptor;
@@ -65,6 +68,18 @@
return inner;
}
+ @Bean
+ public DsProcessor dsProcessor(
+// TenantFrameworkService tenantFrameworkService,
+// DataSource dataSource,
+// DefaultDataSourceCreator dataSourceCreator
+ ) {
+// TenantDsProcessor tenantDsProcessor = new TenantDsProcessor(tenantFrameworkService, dataSourceCreator);
+ TenantDsProcessor tenantDsProcessor = new TenantDsProcessor();
+ tenantDsProcessor.setNextProcessor(new DsSpelExpressionProcessor());
+ return tenantDsProcessor;
+ }
+
// ========== WEB ==========
@Bean
diff --git a/iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/core/service/TenantFrameworkServiceImpl.java b/iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/core/service/TenantFrameworkServiceImpl.java
index 7f98f05..eef1cf4 100644
--- a/iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/core/service/TenantFrameworkServiceImpl.java
+++ b/iailab-framework/iailab-common-biz-tenant/src/main/java/com/iailab/framework/tenant/core/service/TenantFrameworkServiceImpl.java
@@ -69,9 +69,9 @@
return null;
}
// 转换成 dynamic-datasource 配置
- /*return new DataSourceProperty()
- .setPoolName(dataSourceConfig.getName()).setUrl(dataSourceConfig.getUrl())
- .setUsername(dataSourceConfig.getUsername()).setPassword(dataSourceConfig.getPassword());*/
+// return new DataSourceProperty()
+// .setPoolName(dataSourceConfig.getName()).setUrl(dataSourceConfig.getUrl())
+// .setUsername(dataSourceConfig.getUsername()).setPassword(dataSourceConfig.getPassword());
DataSourceProperty ds = new DataSourceProperty();
ds.setPoolName(dataSourceConfig.getName());
--
Gitblit v1.9.3