From ffbbb0dc1d09d586ce1480f5fa2ab3d3c15aff06 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 29 七月 2025 10:53:02 +0800
Subject: [PATCH] 新增财务数据库数据库
---
admin/src/main/resources/application-custom.yml | 7 +++++++
admin/src/main/resources/application.yml | 6 ++++++
framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java | 10 ++++++++++
common/src/main/java/com/ruoyi/common/enums/DataSourceType.java | 7 ++++++-
4 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/admin/src/main/resources/application-custom.yml b/admin/src/main/resources/application-custom.yml
index 2ed80a4..e16f112 100644
--- a/admin/src/main/resources/application-custom.yml
+++ b/admin/src/main/resources/application-custom.yml
@@ -40,6 +40,13 @@
database: #鏁版嵁搴撳悕
username: #鐢ㄦ埛鍚�
password: #瀵嗙爜
+ cwsj: #浠庢暟鎹簱
+ enabled: true #鏄惁寮�鍚粠鏁版嵁搴� 鍏抽棴鏃朵互涓嬩俊鎭彲浠ヤ笉鐢ㄩ厤缃�
+ ip: 61.143.42.70 # IP
+ port: 12027 #绔彛
+ database: zhjk_ot7 #鏁版嵁搴撳悕
+ username: root #鐢ㄦ埛鍚�
+ password: Zh29_!DFFixS #瀵嗙爜
druid: # 鏁版嵁姹�
statViewServlet: #绠＄悊鎺у埗鍙拌处鍙�
login-username: admin
diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml
index 7e498c4..62c443b 100644
--- a/admin/src/main/resources/application.yml
+++ b/admin/src/main/resources/application.yml
@@ -84,6 +84,12 @@
url: jdbc:mysql://${custom.datasource.slave.ip}:${custom.datasource.slave.port}/${custom.datasource.slave.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: ${custom.datasource.slave.username}
password: ${custom.datasource.slave.password}
+ cwsj:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+ enabled: ${custom.datasource.cwsj.enabled}
+ url: jdbc:mysql://${custom.datasource.cwsj.ip}:${custom.datasource.cwsj.port}/${custom.datasource.cwsj.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: ${custom.datasource.cwsj.username}
+ password: ${custom.datasource.cwsj.password}
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
diff --git a/common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
index 0d945be..8cf54b2 100644
--- a/common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
+++ b/common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
@@ -15,5 +15,10 @@
/**
* 浠庡簱
*/
- SLAVE
+ SLAVE,
+
+ /**
+ * 璐㈠姟鏁版嵁搴�
+ */
+ CWSJ
}
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