diff --git a/.golangci.yml b/.golangci.yml index 8b1743a..a4a59ab 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -157,6 +157,8 @@ linters-settings: govet: enable-all: true + disable: + - fieldalignment staticcheck: checks: ["all", "-ST1000", "-ST1003"] diff --git a/internal/config/loader.go b/internal/config/loader.go index 9cb63ea..0c5a28d 100644 --- a/internal/config/loader.go +++ b/internal/config/loader.go @@ -12,9 +12,9 @@ const maxIncludeDepth = 10 // ConfigLoader 配置加载器 type ConfigLoader struct { - baseDir string loadedFiles map[string]bool // 所有已加载文件(用于跳过重复处理) stack map[string]bool // 当前调用栈(用于 DAG 循环检测) + baseDir string depth int } @@ -98,7 +98,7 @@ func (l *ConfigLoader) Load(path string) (*Config, error) { } // merge 合并配置 -func (l *ConfigLoader) merge(dst, src *Config, srcPath string) error { +func (l *ConfigLoader) merge(dst, src *Config, _ string) error { // Server name collision(listen collision 由 validate.go 处理) for _, newServer := range src.Servers { for _, existing := range dst.Servers {