From 1f9b36eee6c7945d281c34e51a8e70501cf938c2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 04 二月 2023 22:30:27 +0800
Subject: [PATCH] 连接池Druid支持新的配置connectTimeout和socketTimeout
---
src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java | 12 ++++++++++++
src/main/resources/application-druid.yml | 4 ++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
index ae6e02f..2dd49ab 100644
--- a/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
+++ b/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java
@@ -24,6 +24,12 @@
@Value("${spring.datasource.druid.maxWait}")
private int maxWait;
+ @Value("${spring.datasource.druid.connectTimeout}")
+ private int connectTimeout;
+
+ @Value("${spring.datasource.druid.socketTimeout}")
+ private int socketTimeout;
+
@Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}")
private int timeBetweenEvictionRunsMillis;
@@ -54,6 +60,12 @@
/** 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂� */
datasource.setMaxWait(maxWait);
+
+ /** 閰嶇疆椹卞姩杩炴帴瓒呮椂鏃堕棿锛屾娴嬫暟鎹簱寤虹珛杩炴帴鐨勮秴鏃舵椂闂达紝鍗曚綅鏄绉� */
+ datasource.setConnectTimeout(connectTimeout);
+
+ /** 閰嶇疆缃戠粶瓒呮椂鏃堕棿锛岀瓑寰呮暟鎹簱鎿嶄綔瀹屾垚鐨勭綉缁滆秴鏃舵椂闂达紝鍗曚綅鏄绉� */
+ datasource.setSocketTimeout(socketTimeout);
/** 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣 */
datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml
index 1f098e4..bcfad3e 100644
--- a/src/main/resources/application-druid.yml
+++ b/src/main/resources/application-druid.yml
@@ -24,6 +24,10 @@
maxActive: 20
# 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
maxWait: 60000
+ # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
+ connectTimeout: 30000
+ # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
+ socketTimeout: 60000
# 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
timeBetweenEvictionRunsMillis: 60000
# 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
--
Gitblit v1.9.3