From 652fca264c2468782a2d5a4fbe21a13df448b91a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Mon, 22 Aug 2022 15:50:39 +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/DruidConfig.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 065a578..ddd6d43 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,14 +38,16 @@
@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");
ds.setXaDataSourceClassName(datasourceClass);
ds.setUniqueResourceName("goalmanage");
- ds.setPoolSize(5);
+ ds.setPoolSize(2);
ds.setXaProperties(prop);
+ ds.setMaxIdleTime(3600000);
+ ds.setMaxLifetime(3000000);
return ds;
}
@@ -54,28 +56,48 @@
@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");
ds.setXaDataSourceClassName(datasourceClass);
ds.setUniqueResourceName("emergency");
- ds.setPoolSize(5);
+ ds.setPoolSize(2);
ds.setXaProperties(prop);
+ ds.setMaxIdleTime(3600000);
+ ds.setMaxLifetime(3000000);
return ds;
}
@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);
// ds.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
ds.setUniqueResourceName("incidentmanage");
- ds.setPoolSize(5);
+ ds.setPoolSize(2);
ds.setXaProperties(prop);
+ ds.setMaxIdleTime(3600000);
+ ds.setMaxLifetime(3000000);
+ return ds;
+ }
+
+ @Autowired
+ @Primary
+ @Bean(name = "dsEquipment")
+ public AtomikosDataSourceBean dsEquipment(Environment env) {
+ AtomikosDataSourceBean ds = new AtomikosDataSourceBean();
+ Properties prop = build(env, "spring.datasource.equipment.");
+ ds.setXaDataSourceClassName(datasourceClass);
+// ds.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource");
+ ds.setUniqueResourceName("equipment");
+ ds.setPoolSize(2);
+ ds.setXaProperties(prop);
+ ds.setMaxIdleTime(3600000);
+ ds.setMaxLifetime(3000000);
return ds;
}
@@ -162,4 +184,4 @@
return wallFilter;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2