From 5bd5f3bcd6d2cb375feb0756505691b551339716 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:55:23 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

---
 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