resolved = getResolvedDataSources();
+ return resolved.keySet();
+ }
+
+ /**
+ * 判断 key 是否已注册
+ */
+ public boolean containsKey(String key) {
+ return getDataSourceByKey(key) != null;
+ }
+
+ /**
+ * 重建路由表（内部同步需由调用方保证线程安全）
+ */
+ private void rebuildResolvedDataSources() {
+ super.setTargetDataSources(new HashMap<>(targetDataSources));
+ super.afterPropertiesSet();
+ }
+
+ private void closeQuietly(Object ds) {
+ if (ds instanceof DruidDataSource) {
+ try {
+ ((DruidDataSource) ds).close();
+ } catch (Exception e) {
+ log.warn("关闭旧数据源连接池异常: {}", e.getMessage());
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java b/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java
index d9e984ae..1632f711 100644
--- a/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java
+++ b/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java
@@ -1,6 +1,9 @@
package com.yfd.platform.datasource;
import com.alibaba.druid.pool.DruidDataSource;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -11,67 +14,62 @@ import java.util.HashMap;
import java.util.Map;
/**
- * 动态数据源配置，支持 达梦(DM) 和 Oracle 两种数据库，每种各有主从(master/slave)
+ * 动态数据源配置，仅保留业务主库（达梦 DM）的 yml 配置。
+ *
+ * 其他数据源（如 Oracle、MySQL、PostgreSQL 等）通过数据库表
+ * {@code GEN_DATASOURCE_CONF} 动态注册，见 {@link DynamicDataSourceRegistry}。
*
* @author yfd
*/
@Configuration
public class DynamicDataSourceConfig {
- // ==================== 达梦(DM) 数据源 ====================
+ // ==================== 达梦(DM) 数据源（业务主库，yml 固定配置） ====================
@Bean
@ConfigurationProperties("spring.datasource.druid.dm-master")
+ @ConditionalOnProperty(prefix = "spring.datasource.druid.dm-master", name = "enabled", havingValue = "true", matchIfMissing = true)
public DataSource dmMasterDataSource() {
- DruidDataSource dataSource = new DruidDataSource();
- dataSource.setBreakAfterAcquireFailure(true);
- dataSource.setConnectionErrorRetryAttempts(0);
- return dataSource;
+ return newDruidDataSource();
}
@Bean
@ConfigurationProperties("spring.datasource.druid.dm-slave")
+ @ConditionalOnProperty(prefix = "spring.datasource.druid.dm-slave", name = "enabled", havingValue = "true", matchIfMissing = true)
public DataSource dmSlaveDataSource() {
- DruidDataSource dataSource = new DruidDataSource();
- dataSource.setBreakAfterAcquireFailure(true);
- dataSource.setConnectionErrorRetryAttempts(0);
- return dataSource;
- }
-
- // ==================== Oracle 数据源 ====================
-
- @Bean
- @ConfigurationProperties("spring.datasource.druid.oracle-master")
- public DataSource oracleMasterDataSource() {
- DruidDataSource dataSource = new DruidDataSource();
- dataSource.setBreakAfterAcquireFailure(true);
- dataSource.setConnectionErrorRetryAttempts(0);
- return dataSource;
- }
-
- @Bean
- @ConfigurationProperties("spring.datasource.druid.oracle-slave")
- public DataSource oracleSlaveDataSource() {
- DruidDataSource dataSource = new DruidDataSource();
- dataSource.setBreakAfterAcquireFailure(true);
- dataSource.setConnectionErrorRetryAttempts(0);
- return dataSource;
+ return newDruidDataSource();
}
// ==================== 路由数据源 ====================
@Bean
@Primary
- public DynamicDataSource dataSource(DataSource dmMasterDataSource,
- DataSource dmSlaveDataSource,
- DataSource oracleMasterDataSource,
- DataSource oracleSlaveDataSource) {
- Map targetDataSources = new HashMap<>();
- targetDataSources.put(DataSourceKeys.DM_MASTER, dmMasterDataSource);
- targetDataSources.put(DataSourceKeys.DM_SLAVE, dmSlaveDataSource);
- targetDataSources.put(DataSourceKeys.ORACLE_MASTER, oracleMasterDataSource);
- targetDataSources.put(DataSourceKeys.ORACLE_SLAVE, oracleSlaveDataSource);
+ public DynamicDataSource dataSource(@Qualifier("dmMasterDataSource") ObjectProvider dmMaster,
+ @Qualifier("dmSlaveDataSource") ObjectProvider dmSlave) {
+ Map targetDataSources = new HashMap<>();
+ putIfPresent(targetDataSources, DataSourceKeys.DM_MASTER, dmMaster);
+ putIfPresent(targetDataSources, DataSourceKeys.DM_SLAVE, dmSlave);
+
// 默认使用达梦主库
- return new DynamicDataSource(dmMasterDataSource, targetDataSources);
+ DataSource defaultDataSource = dmMaster.getIfAvailable();
+ if (defaultDataSource == null) {
+ defaultDataSource = targetDataSources.values().stream().findFirst()
+ .orElseThrow(() -> new IllegalStateException("未开启任何数据源，请至少启用一个数据源"));
+ }
+ return new DynamicDataSource(defaultDataSource, targetDataSources);
}
-}
+
+ private DruidDataSource newDruidDataSource() {
+ DruidDataSource dataSource = new DruidDataSource();
+ dataSource.setBreakAfterAcquireFailure(true);
+ dataSource.setConnectionErrorRetryAttempts(0);
+ return dataSource;
+ }
+
+ private void putIfPresent(Map targetDataSources, String key, ObjectProvider provider) {
+ DataSource dataSource = provider.getIfAvailable();
+ if (dataSource != null) {
+ targetDataSources.put(key, dataSource);
+ }
+ }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceController.java b/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceController.java
new file mode 100644
index 00000000..1c722ba0
--- /dev/null
+++ b/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceController.java
@@ -0,0 +1,219 @@
+package com.yfd.platform.datasource;
+
+import com.yfd.platform.config.ResponseResult;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.StatementCallback;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.util.*;
+
+/**
+ * 动态数据源管理控制器，提供运行时数据源注册/注销/热刷新/列表查询等操作。
+ *
+ * 数据源配置存储在数据库表 {@code GEN_DATASOURCE_CONF} 中，通过此接口可：
+ *
+ * - 查看当前已注册的所有数据源
+ * - 手动注册/注销单个数据源
+ * - 从数据库表热刷新全部数据源
+ *
+ */
+@RestController
+@RequestMapping("/datasource")
+@Tag(name = "动态数据源管理")
+@Validated
+public class DynamicDataSourceController {
+
+ @Resource
+ private DynamicDataSourceRegistry dynamicDataSourceRegistry;
+
+ @Resource
+ private DynamicDataSource dynamicDataSource;
+
+ @Resource
+ private DynamicDataSourceTestService dynamicDataSourceTestService;
+
+ /**
+ * 列出所有已注册的数据源（含系统内置 dm-master/dm-slave）
+ */
+ @GetMapping("/list")
+ @Operation(summary = "列出所有已注册的数据源")
+ public ResponseResult listDataSources() {
+ Set