From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +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 | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 ddd6d43..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
@@ -46,8 +46,8 @@
ds.setUniqueResourceName("goalmanage");
ds.setPoolSize(2);
ds.setXaProperties(prop);
- ds.setMaxIdleTime(3600000);
- ds.setMaxLifetime(3000000);
+ ds.setMaxIdleTime(3600);
+ ds.setMaxLifetime(3000);
return ds;
}
@@ -64,8 +64,8 @@
ds.setUniqueResourceName("emergency");
ds.setPoolSize(2);
ds.setXaProperties(prop);
- ds.setMaxIdleTime(3600000);
- ds.setMaxLifetime(3000000);
+ ds.setMaxIdleTime(3600);
+ ds.setMaxLifetime(3000);
return ds;
}
@@ -80,8 +80,8 @@
ds.setUniqueResourceName("incidentmanage");
ds.setPoolSize(2);
ds.setXaProperties(prop);
- ds.setMaxIdleTime(3600000);
- ds.setMaxLifetime(3000000);
+ ds.setMaxIdleTime(3600);
+ ds.setMaxLifetime(3000);
return ds;
}
@@ -96,8 +96,8 @@
ds.setUniqueResourceName("equipment");
ds.setPoolSize(2);
ds.setXaProperties(prop);
- ds.setMaxIdleTime(3600000);
- ds.setMaxLifetime(3000000);
+ ds.setMaxIdleTime(3600);
+ ds.setMaxLifetime(3000);
return ds;
}
--
Gitblit v1.9.2