public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-20 17:57:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

合并代码

Browse Source
This commit is contained in:
zhangwenjian
2020-04-18 10:33:29 +08:00
parent a2f4c00246
commit f5037f50a7
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/config/config.go
+2 -9
View File
@@ -25,20 +25,13 @@ func ConfigSetup(path string) {
if err != nil {
log.Fatal(fmt.Sprintf("Read config file fail: %s", err.Error()))
}
//Replace environment variables
err = viper.ReadConfig(strings.NewReader(os.ExpandEnv(string(content))))
if err != nil {
log.Fatal(fmt.Sprintf("Parse config file fail: %s", err.Error()))
}
//}
//
//func InitConfig(fileName string) {
// viper.SetConfigName(fileName)
// viper.AddConfigPath("/config")
// err := viper.ReadInConfig()
// if err != nil {
// log.Println(err)
// }
cfgDatabase = viper.Sub("settings.database")
if cfgDatabase == nil {