From a32605c854a038d3270ca3cdd394977f25072ff3 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 11 八月 2022 14:56:40 +0800
Subject: [PATCH] 调整数据库配置
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java | 6 +++---
safePlatfrom-out-web/src/main/resources/config/application.yaml | 7 ++-----
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java | 4 ----
3 files changed, 5 insertions(+), 12 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);
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
index 1424c46..1088b59 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
@@ -51,15 +51,11 @@
//-------------------
Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**/**Mapper.xml");
-// Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1));
-// resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2)));
Resource[] resourceArray = new Resource[resourceArrayList.size()];
resourceArrayList.toArray(resourceArray);
factoryBean.setMapperLocations(resourceArray);
//-------------------
-
-// factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/**/**Mapper.xml"));
//设置分页插件
Interceptor[] plugins = {mybatisPlusInterceptor};
factoryBean.setPlugins(plugins);
diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index 363c598..772fabb 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -2,11 +2,8 @@
application:
name: safeplatform-out
profiles:
- active: test
-# active: guotai-demo
-
-#mybatis-plus:
-# mapper-locations: classpath:config/mapper/**/*.xml
+# active: test
+ active: guotai-demo
logging:
config: classpath:config/log/log4j2.xml
--
Gitblit v1.9.2