From 4cfcdfa1f82e63ffdd481a4b244befe8a88ec3a7 Mon Sep 17 00:00:00 2001
From: yukaidi <yukaidi@duck.com>
Date: Fri, 29 May 2026 11:39:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Deploy=20=E5=90=AF=E5=8A=A8=E6=97=B6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BB=8E=20resources/=20=E5=AD=90=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E6=89=BE=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当 app.yml 在当前目录不存在时，自动回退到 resources/app.yml，
解决 Docker 部署时配置文件在 resources/ 子目录导致启动失败的问题。
---
 core/src/main/java/cn/qaiu/vx/core/Deploy.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/cn/qaiu/vx/core/Deploy.java b/core/src/main/java/cn/qaiu/vx/core/Deploy.java
index 09c2f9f..5fb606f 100644
--- a/core/src/main/java/cn/qaiu/vx/core/Deploy.java
+++ b/core/src/main/java/cn/qaiu/vx/core/Deploy.java
@@ -16,6 +16,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.lang.management.ManagementFactory;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.UUID;
@@ -62,7 +64,12 @@ public final class Deploy {
             path.append("-").append(args[0].replace("app-",""));
         }
 
-        // 读取yml配置
+        // 读取yml配置，优先当前目录，其次 resources/ 子目录
+        String configFile = path + ".yml";
+        if (!Files.exists(Path.of(configFile)) && Files.exists(Path.of("resources", configFile))) {
+            path.insert(0, "resources/");
+            LOGGER.info("从 resources/ 目录加载配置: {}", path + ".yml");
+        }
         ConfigUtil.readYamlConfig(path.toString(), tempVertx)
                 .onSuccess(this::readConf)
                 .onFailure(err -> {