From bbf8032e6a06a60cbf5fbdb9e9a5a2c6294eccff Mon Sep 17 00:00:00 2001 From: xfy Date: Fri, 17 Apr 2026 10:41:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(config):=20=E8=B0=83=E6=95=B4=20includ?= =?UTF-8?q?e=20=E9=85=8D=E7=BD=AE=E7=A4=BA=E4=BE=8B=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 include 配置示例从 SSL 配置前移动到变量配置后的位置， 使配置示例的组织结构更加合理。 Co-Authored-By: Claude Opus 4.7 --- internal/config/defaults.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/config/defaults.go b/internal/config/defaults.go index 1a47962..9de80b9 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go @@ -398,14 +398,6 @@ func GenerateConfigYAML(cfg *Config) ([]byte, error) { buf.WriteString(" # # replacement: \"$scheme://$host/$1\" # 使用捕获组 $1\n") buf.WriteString("\n") - // include 配置 - buf.WriteString("# 配置文件拆分（include 机制）\n") - buf.WriteString("# include:\n") - buf.WriteString("# - path: \"conf.d/*.yaml\" # 相对路径 + glob 模式\n") - buf.WriteString("# - path: \"sites/example.yaml\" # 单个文件引入\n") - buf.WriteString("# 支持循环检测和深度限制（最大 10 层）\n") - buf.WriteString("\n") - // SSL 配置 buf.WriteString(" # SSL/TLS 配置\n") buf.WriteString(" # ssl:\n") @@ -663,6 +655,14 @@ func GenerateConfigYAML(cfg *Config) ([]byte, error) { buf.WriteString(" set: {} # 自定义变量集合，如 {app_name: \"lolly\"}\n") buf.WriteString(" # 注意：变量名只允许字母、数字、下划线，不能与内置变量冲突\n") buf.WriteString(" # 不能以 arg_、http_、cookie_ 开头（这些是动态变量前缀）\n") + buf.WriteString("\n") + + // include 配置 + buf.WriteString("# 配置文件拆分（include 机制）\n") + buf.WriteString("# include:\n") + buf.WriteString("# - path: \"conf.d/*.yaml\" # 相对路径 + glob 模式\n") + buf.WriteString("# - path: \"sites/example.yaml\" # 单个文件引入\n") + buf.WriteString("# 支持循环检测和深度限制（最大 10 层）\n") return buf.Bytes(), nil }