From b116be492a45448d83ae26b289b3edcf7009114f Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Sun, 12 Jan 2025 17:52:42 +0800
Subject: [PATCH] =?UTF-8?q?GlobalDbSetting=E4=BC=98=E5=8C=96=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=85=8D=E7=BD=AE=E8=AF=BB=E5=8F=96=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=85=88=E8=AF=BB=E5=8F=96=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=80=8C=E9=9D=9Ejar=E4=B8=AD=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=88issue#900@Github=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  4 ++-
 .../hutool/core/io/resource/FileResource.java |  3 ++
 .../java/cn/hutool/db/GlobalDbConfig.java     | 31 +++++++++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa1d3e64d..32fee2e7a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,13 @@
 # 🚀Changelog
 
 -------------------------------------------------------------------------------------------------------------
-# 5.8.36(2025-01-10)
+# 5.8.36(2025-01-12)
 
 ### 🐣新特性
 * 【crypto 】      增加BCUtil.decodeECPrivateKey方法（issue#3829@Github）
 * 【core   】      增加HtmlUtil.cleanEmptyTag方法（pr#3838@Github）
+* 【db     】      GlobalDbSetting优化默认配置读取规则，优先读取文件而非jar中的文件（issue#900@Github）
+
 ### 🐞Bug修复
 * 【aop    】      修复ProxyUtil可能的空指针问题（issue#IBF20Z@Gitee）
 * 【core   】      修复XmlUtil转义调用方法错误问题，修复XmlEscape未转义单引号问题（pr#3837@Github）
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java b/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java
index 3fcdea20a..06b661e11 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/resource/FileResource.java
@@ -79,6 +79,9 @@ public class FileResource implements Resource, Serializable {
 
 	@Override
 	public InputStream getStream() throws NoResourceException {
+		if (!this.file.exists()) {
+			throw new NoResourceException("File [{}] not exist!", this.file.getAbsolutePath());
+		}
 		return FileUtil.getInputStream(this.file);
 	}
 
diff --git a/hutool-db/src/main/java/cn/hutool/db/GlobalDbConfig.java b/hutool-db/src/main/java/cn/hutool/db/GlobalDbConfig.java
index fc720fe72..0c3ba4ba2 100644
--- a/hutool-db/src/main/java/cn/hutool/db/GlobalDbConfig.java
+++ b/hutool-db/src/main/java/cn/hutool/db/GlobalDbConfig.java
@@ -1,6 +1,7 @@
 package cn.hutool.db;
 
 import cn.hutool.core.io.resource.NoResourceException;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.db.sql.SqlLog;
 import cn.hutool.log.level.Level;
 import cn.hutool.setting.Setting;
@@ -83,20 +84,30 @@ public class GlobalDbConfig {
 				throw new NoResourceException("Customize db setting file [{}] not found !", dbSettingPath);
 			}
 		} else {
-			try {
-				setting = new Setting(DEFAULT_DB_SETTING_PATH, true);
-			} catch (NoResourceException e) {
-				// 尝试ClassPath下直接读取配置文件
-				try {
-					setting = new Setting(DEFAULT_DB_SETTING_PATH2, true);
-				} catch (NoResourceException e2) {
-					throw new NoResourceException("Default db setting [{}] or [{}] in classpath not found !", DEFAULT_DB_SETTING_PATH, DEFAULT_DB_SETTING_PATH2);
-				}
-			}
+			setting = tryDefaultDbSetting();
 		}
 		return setting;
 	}
 
+	/**
+	 * 获取自定义或默认位置数据库配置{@link Setting}
+	 *
+	 * @return 数据库配置
+	 * @since 5.8.36
+	 */
+	private static Setting tryDefaultDbSetting() {
+		final String[] defaultDbSettingPaths = {"file:" + DEFAULT_DB_SETTING_PATH, "file:" + DEFAULT_DB_SETTING_PATH2, DEFAULT_DB_SETTING_PATH, DEFAULT_DB_SETTING_PATH2};
+		for (final String settingPath : defaultDbSettingPaths) {
+			try {
+				return new Setting(settingPath, true);
+			} catch (final NoResourceException e) {
+				// ignore
+			}
+		}
+
+		throw new NoResourceException("Default db settings [{}] in classpath not found !", ArrayUtil.join(defaultDbSettingPaths, ","));
+	}
+
 	/**
 	 * 设置全局配置：是否通过debug日志显示SQL
 	 *