From aa2caac3f78a32e0627d4ed6d0a93c184b60b853 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Mon, 6 Dec 2021 22:30:40 +0800 Subject: [PATCH] feat: support expand env --- modules/config/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/config/config.go b/modules/config/config.go index d8707f8..c49a160 100644 --- a/modules/config/config.go +++ b/modules/config/config.go @@ -149,11 +149,11 @@ type MongoDBConfig struct { func Parse(path string) *Config { fromEnv := os.Getenv("GCQ_UIN") != "" - file, err := os.Open(path) + file, err := os.ReadFile(path) config := &Config{} if err == nil { - defer func() { _ = file.Close() }() - if err = yaml.NewDecoder(file).Decode(config); err != nil && !fromEnv { + err = yaml.NewDecoder(strings.NewReader(os.ExpandEnv(string(file)))).Decode(config) + if err != nil && !fromEnv { log.Fatal("配置文件不合法!", err) } } else if !fromEnv {