From 88cae1d6125023b5b00153e330ba1c5e10c6eec8 Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Tue, 2 Jan 2024 13:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DDruid=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E6=B1=A0=E6=97=A0=E6=B3=95=E8=AE=BE=E7=BD=AE=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hutool-db/pom.xml                             |  2 +-
 .../hutool/db/ds/druid/DruidDSFactory.java    | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index 31c1c263e..bab350310 100755
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -35,7 +35,7 @@
 		<dbcp2.version>2.9.0</dbcp2.version>
 		<!-- 固定10.0.x -->
 		<tomcat-jdbc.version>10.0.27</tomcat-jdbc.version>
-		<druid.version>1.2.17</druid.version>
+		<druid.version>1.2.21</druid.version>
 		<!-- 固定4.x -->
 		<hikariCP.version>4.0.3</hikariCP.version>
 		<sqlite.version>3.43.0.0</sqlite.version>
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
index 7e876a86e..4a75d482b 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
@@ -74,6 +74,38 @@ public class DruidDSFactory implements DSFactory {
 			ds.setBreakAfterAcquireFailure(druidProps.getBool(breakAfterAcquireFailureKey));
 		}
 
+		// issue#I8STFC 补充
+		// validationQueryTimeout
+		final String validationQueryTimeout = "druid.validationQueryTimeout";
+		if(druidProps.containsKey(validationQueryTimeout)){
+			ds.setValidationQueryTimeout(druidProps.getInt(validationQueryTimeout));
+		}
+		// queryTimeout
+		final String queryTimeout = "druid.queryTimeout";
+		if(druidProps.containsKey(queryTimeout)){
+			ds.setQueryTimeout(druidProps.getInt(queryTimeout));
+		}
+		// connectTimeout
+		final String connectTimeout = "druid.connectTimeout";
+		if(druidProps.containsKey(connectTimeout)){
+			ds.setConnectTimeout(druidProps.getInt(connectTimeout));
+		}
+		// socketTimeout
+		final String socketTimeout = "druid.socketTimeout";
+		if(druidProps.containsKey(socketTimeout)){
+			ds.setSocketTimeout(druidProps.getInt(socketTimeout));
+		}
+		// transactionQueryTimeout
+		final String transactionQueryTimeout = "druid.transactionQueryTimeout";
+		if(druidProps.containsKey(transactionQueryTimeout)){
+			ds.setTransactionQueryTimeout(druidProps.getInt(transactionQueryTimeout));
+		}
+		// loginTimeout
+		final String loginTimeout = "druid.loginTimeout";
+		if(druidProps.containsKey(loginTimeout)){
+			ds.setLoginTimeout(druidProps.getInt(loginTimeout));
+		}
+
 		// 检查关联配置，在用户未设置某项配置时，设置默认值
 		if (null == ds.getValidationQuery()) {
 			// 在validationQuery未设置的情况下，以下三项设置都将无效