From 9ff903e0e9db52e161896c44cbe03dbbbc5fdd09 Mon Sep 17 00:00:00 2001
From: 15815213711 <a13118667520@163.com>
Date: 星期二, 29 七月 2025 14:16:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
index f6abac1..cd65543 100644
--- a/framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
+++ b/framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java
@@ -49,6 +49,15 @@
return druidProperties.dataSource(dataSource);
}
+ @Bean
+ @ConfigurationProperties("spring.datasource.druid.cwsj")
+ @ConditionalOnProperty(prefix = "spring.datasource.druid.cwsj", name = "enabled", havingValue = "true")
+ public DataSource cwsjDataSource(DruidProperties druidProperties)
+ {
+ DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+ return druidProperties.dataSource(dataSource);
+ }
+
@Bean(name = "dynamicDataSource")
@Primary
public DynamicDataSource dataSource(DataSource masterDataSource)
@@ -56,6 +65,7 @@
Map<Object, Object> targetDataSources = new HashMap<>();
targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
+ setDataSource(targetDataSources, DataSourceType.CWSJ.name(), "cwsjDataSource");
return new DynamicDataSource(masterDataSource, targetDataSources);
}
--
Gitblit v1.8.0