TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-05 17:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复$HOME未定义问题

Browse Source
This commit is contained in:
刘祥超
2021-02-01 09:26:20 +08:00
parent 009b48602e
commit 2bc3d1f81b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/configs/api_config.go
View File

@@ -34,14 +34,15 @@ func SharedAPIConfig() (*APIConfig, error) {
localFile := Tea.ConfigFile("api.yaml") localFile := Tea.ConfigFile("api.yaml")
isFromLocal := false isFromLocal := false
paths := []string{localFile} paths := []string{localFile}
homeDir, err := os.UserHomeDir() homeDir, homeErr := os.UserHomeDir()
if err == nil { if homeErr == nil {
paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/api.yaml") paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/api.yaml")
} }
paths = append(paths, "/etc/"+teaconst.ProcessName+"/api.yaml") paths = append(paths, "/etc/"+teaconst.ProcessName+"/api.yaml")
// 依次检查文件 // 依次检查文件
var data []byte var data []byte
var err error
for _, path := range paths { for _, path := range paths {
data, err = ioutil.ReadFile(path) data, err = ioutil.ReadFile(path)
if err == nil { if err == nil {
@@ -73,8 +74,8 @@ func SharedAPIConfig() (*APIConfig, error) {
_, err := os.Stat(dbConfigFile) _, err := os.Stat(dbConfigFile)
if err == nil { if err == nil {
paths := []string{} paths := []string{}
homeDir, err := os.UserHomeDir() homeDir, homeErr := os.UserHomeDir()
if err == nil { if homeErr == nil {
paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/db.yaml") paths = append(paths, homeDir+"/."+teaconst.ProcessName+"/db.yaml")
} }
paths = append(paths, "/etc/"+teaconst.ProcessName+"/db.yaml") paths = append(paths, "/etc/"+teaconst.ProcessName+"/db.yaml")