shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 11:33:48 +08:00
Code Issues Projects Releases Wiki Activity

feat: support expand env

Browse Source
This commit is contained in:
wdvxdr 2021-12-06 22:30:40 +08:00
parent 0ead592114
commit aa2caac3f7
No known key found for this signature in database
GPG Key ID: 703F8C071DE7A1B6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/config/config.go
View File

@ -149,11 +149,11 @@ type MongoDBConfig struct {
func Parse(path string) *Config { func Parse(path string) *Config {
fromEnv := os.Getenv("GCQ_UIN") != "" fromEnv := os.Getenv("GCQ_UIN") != ""
file, err := os.Open(path) file, err := os.ReadFile(path)
config := &Config{} config := &Config{}
if err == nil { if err == nil {
defer func() { _ = file.Close() }() err = yaml.NewDecoder(strings.NewReader(os.ExpandEnv(string(file)))).Decode(config)
if err = yaml.NewDecoder(file).Decode(config); err != nil && !fromEnv { if err != nil && !fromEnv {
log.Fatal("配置文件不合法!", err) log.Fatal("配置文件不合法!", err)
} }
} else if !fromEnv { } else if !fromEnv {