From 5ed84eaec030109b0e6b77ae2667ed56e959871b Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 2022 16:58:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 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 159f486..396299d 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
@@ -15,23 +15,18 @@
@Configuration
public class DataSourceConfig {
- @Bean
- @ConfigurationProperties("spring.datasource.goalmanage")
- DataSource dsGoalManage(){
- return DruidDataSourceBuilder.create().build();
- }
-
- @Bean
- @ConfigurationProperties("spring.datasource.emergency")
- DataSource dsEmergency(){
- return DruidDataSourceBuilder.create().build();
- }
-
// @Bean
-// @ConfigurationProperties("spring.datasource.two")
-// DataSource dsTwo(){
+// @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