KJZH001/nezha-2024
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(config): ordinal priority

Browse Source
This commit is contained in:
Chotow 2024-11-13 22:51:30 +08:00
parent dfdd7b0d86
commit 9fac8ca024
No known key found for this signature in database
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
model/config.go
View File

@ -111,12 +111,7 @@ func (c *Config) Read(path string) error {
c.k = koanf.New(".") c.k = koanf.New(".")
c.filePath = path c.filePath = path
if _, err := os.Stat(path); err == nil { // 先读取环境变量，然后读取配置文件；后者可以覆盖前者，因为哪吒支持在线修改配置
err = c.k.Load(file.Provider(path), yaml.Parser())
if err != nil {
return err
}
}
err := c.k.Load(env.Provider("NZ_", ".", func(s string) string { err := c.k.Load(env.Provider("NZ_", ".", func(s string) string {
return strings.Replace(strings.ToLower(strings.TrimPrefix(s, "NZ_")), "_", ".", -1) return strings.Replace(strings.ToLower(strings.TrimPrefix(s, "NZ_")), "_", ".", -1)
@ -125,6 +120,13 @@ func (c *Config) Read(path string) error {
return err return err
} }
if _, err := os.Stat(path); err == nil {
err = c.k.Load(file.Provider(path), yaml.Parser())
if err != nil {
return err
}
}
err = c.k.Unmarshal("", c) err = c.k.Unmarshal("", c)
if err != nil { if err != nil {
return err return err
@ -180,6 +182,7 @@ func (c *Config) Read(path string) error {
c.Oauth2.OidcGroupClaim = "groups" c.Oauth2.OidcGroupClaim = "groups"
} }
panic(1)
c.updateIgnoredIPNotificationID() c.updateIgnoredIPNotificationID()
return nil return nil
} }