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/DruidConfig.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java
index 520ae20..e260cd7 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java
@@ -38,7 +38,7 @@
@Bean(name = "dsGoalManage")
@Primary
@Autowired
- public DataSource dsAccount(Environment env) {
+ public DataSource dsGoalManage(Environment env) {
AtomikosDataSourceBean ds = new AtomikosDataSourceBean();
Properties prop = build(env, "spring.datasource.goalmanage.");
// ds.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
@@ -54,7 +54,7 @@
@Autowired
@Primary
@Bean(name = "dsEmergency")
- public AtomikosDataSourceBean dsDoublePrevent(Environment env) {
+ public AtomikosDataSourceBean dsEmergency(Environment env) {
AtomikosDataSourceBean ds = new AtomikosDataSourceBean();
Properties prop = build(env, "spring.datasource.emergency.");
// ds.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
@@ -68,7 +68,7 @@
@Autowired
@Primary
@Bean(name = "dsIncidentManage")
- public AtomikosDataSourceBean dsSafeCheck(Environment env) {
+ public AtomikosDataSourceBean dsIncidentManage(Environment env) {
AtomikosDataSourceBean ds = new AtomikosDataSourceBean();
Properties prop = build(env, "spring.datasource.incidentmanage.");
ds.setXaDataSourceClassName(datasourceClass);
--
Gitblit v1.9.2