From f8c25d1fab78aa4e0a6bdb10f91e61698af434c4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 01 七月 2022 14:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
index 9b511fb..159f486 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
@@ -16,8 +16,14 @@
public class DataSourceConfig {
@Bean
- @ConfigurationProperties("spring.datasource.one")
- DataSource dsOne(){
+ @ConfigurationProperties("spring.datasource.goalmanage")
+ DataSource dsGoalManage(){
+ return DruidDataSourceBuilder.create().build();
+ }
+
+ @Bean
+ @ConfigurationProperties("spring.datasource.emergency")
+ DataSource dsEmergency(){
return DruidDataSourceBuilder.create().build();
}
--
Gitblit v1.9.2