This commit is contained in:
BaoXuebin 2021-12-15 23:14:04 +08:00 committed by leo
parent f87a25d75e
commit 82c2bf4e2b
4 changed files with 13 additions and 6 deletions

1
.gitignore vendored
View File

@ -2,5 +2,6 @@
.git .git
bindata.go bindata.go
*.exe *.exe
beancount-gs
gin.log gin.log
config.json config.json

Binary file not shown.

View File

@ -209,10 +209,14 @@ func LoadLedgerConfigMap() error {
if err != nil { if err != nil {
return err return err
} }
err = json.Unmarshal(fileContent, &ledgerConfigMap) if string(fileContent) != "" {
if err != nil { err = json.Unmarshal(fileContent, &ledgerConfigMap)
LogSystemError("Failed unmarshal ledger_config file (" + path + ")") if err != nil {
return err LogSystemError("Failed unmarshal ledger_config file (" + path + ")")
return err
}
} else {
ledgerConfigMap = make(map[string]Config)
} }
LogSystemInfo("Success load ledger_config file (" + path + ")") LogSystemInfo("Success load ledger_config file (" + path + ")")
} }

View File

@ -3,11 +3,13 @@ package script
import "os" import "os"
func GetServerConfigFilePath() string { func GetServerConfigFilePath() string {
return "./config/config.json" currentPath, _ := os.Getwd()
return currentPath + "/config/config.json"
} }
func GetServerWhiteListFilePath() string { func GetServerWhiteListFilePath() string {
return "./config/white_list.json" currentPath, _ := os.Getwd()
return currentPath + "/config/white_list.json"
} }
func GetServerLedgerConfigFilePath() string { func GetServerLedgerConfigFilePath() string {