From 74c86606c9abc778a3848025395d7c7d6fbcfac0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 19 七月 2022 15:28:19 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
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