diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java
index 24b6ae58a..b1bc8b880 100644
--- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java
+++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java
@@ -82,4 +82,9 @@ public interface RuleConstants {
*/
String CHINES_TRAN_LANGUAGE_CODE = "chinese";
+ /**
+ * 租户数据源标识前缀
+ */
+ String TENANT_DB_PREFIX = "sys_tenant_db_";
+
}
diff --git a/kernel-d-db/db-api/pom.xml b/kernel-d-db/db-api/pom.xml
index dd6333531..9687887fe 100644
--- a/kernel-d-db/db-api/pom.xml
+++ b/kernel-d-db/db-api/pom.xml
@@ -46,14 +46,6 @@
${roses.version}
-
-
-
- cn.stylefeng.roses
- ds-container-api
- ${roses.version}
-
-
diff --git a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/util/DatabaseUtil.java b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/util/DatabaseUtil.java
index 0126f3f75..88bc6094a 100644
--- a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/util/DatabaseUtil.java
+++ b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/util/DatabaseUtil.java
@@ -11,7 +11,7 @@ import cn.stylefeng.roses.kernel.db.api.sqladapter.database.CreateDatabaseSql;
import cn.stylefeng.roses.kernel.db.api.sqladapter.database.GetDatabasesSql;
import cn.stylefeng.roses.kernel.db.api.sqladapter.table.TableFieldListSql;
import cn.stylefeng.roses.kernel.db.api.sqladapter.table.TableListSql;
-import cn.stylefeng.roses.kernel.dsctn.api.constants.DatasourceContainerConstants;
+import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
import lombok.extern.slf4j.Slf4j;
import java.sql.Connection;
@@ -48,8 +48,8 @@ public class DatabaseUtil {
while (resultSet.next()) {
String database = resultSet.getString("database");
if (StrUtil.isNotBlank(database)) {
- if (StrUtil.startWith(database, DatasourceContainerConstants.TENANT_DB_PREFIX)) {
- database = database.replaceAll(DatasourceContainerConstants.TENANT_DB_PREFIX, "");
+ if (StrUtil.startWith(database, RuleConstants.TENANT_DB_PREFIX)) {
+ database = database.replaceAll(RuleConstants.TENANT_DB_PREFIX, "");
databasesList.add(database);
}
}
diff --git a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/constants/DatasourceContainerConstants.java b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/constants/DatasourceContainerConstants.java
index 337e7c621..ff9c84c1f 100644
--- a/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/constants/DatasourceContainerConstants.java
+++ b/kernel-d-ds-container/ds-container-api/src/main/java/cn/stylefeng/roses/kernel/dsctn/api/constants/DatasourceContainerConstants.java
@@ -52,9 +52,4 @@ public interface DatasourceContainerConstants {
*/
int MULTI_DATA_SOURCE_EXCHANGE_AOP = 1;
- /**
- * 租户数据源标识前缀
- */
- String TENANT_DB_PREFIX = "sys_tenant_db_";
-
}
diff --git a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
index 0133147ae..cc6015ec3 100644
--- a/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
+++ b/kernel-d-ds-container/ds-container-business/src/main/java/cn/stylefeng/roses/kernel/dsctn/modular/service/impl/DatabaseInfoServiceImpl.java
@@ -40,6 +40,7 @@ import cn.stylefeng.roses.kernel.dsctn.modular.entity.DatabaseInfo;
import cn.stylefeng.roses.kernel.dsctn.modular.factory.DruidPropertiesFactory;
import cn.stylefeng.roses.kernel.dsctn.modular.mapper.DatabaseInfoMapper;
import cn.stylefeng.roses.kernel.dsctn.modular.service.DatabaseInfoService;
+import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -56,7 +57,6 @@ import java.sql.SQLException;
import java.util.List;
import static cn.stylefeng.roses.kernel.dsctn.api.constants.DatasourceContainerConstants.MASTER_DATASOURCE_NAME;
-import static cn.stylefeng.roses.kernel.dsctn.api.constants.DatasourceContainerConstants.TENANT_DB_PREFIX;
import static cn.stylefeng.roses.kernel.dsctn.api.exception.enums.DatasourceContainerExceptionEnum.*;
/**
@@ -91,7 +91,7 @@ public class DatabaseInfoServiceImpl extends ServiceImpl