From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 d7922fd..4b7e3c5 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");
@@ -46,6 +46,8 @@
ds.setUniqueResourceName("goalmanage");
ds.setPoolSize(2);
ds.setXaProperties(prop);
+ ds.setMaxIdleTime(3600);
+ ds.setMaxLifetime(3000);
return ds;
}
@@ -54,7 +56,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");
@@ -62,13 +64,15 @@
ds.setUniqueResourceName("emergency");
ds.setPoolSize(2);
ds.setXaProperties(prop);
+ ds.setMaxIdleTime(3600);
+ ds.setMaxLifetime(3000);
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);
@@ -76,6 +80,24 @@
ds.setUniqueResourceName("incidentmanage");
ds.setPoolSize(2);
ds.setXaProperties(prop);
+ ds.setMaxIdleTime(3600);
+ ds.setMaxLifetime(3000);
+ 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(3600);
+ ds.setMaxLifetime(3000);
return ds;
}
@@ -162,4 +184,4 @@
return wallFilter;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2