From 43105be63e02a447916c56d1b9707e02f7fa4d62 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期二, 05 七月 2022 09:10:53 +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 | 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