Merge pull request '修改读取配置文件的路径' (#9) from fix_start into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_ETL/pulls/9

infra/config/config.go

@@ -3,7 +3,6 @@ package config
 import (
 	"LAPP_ETL/utils"
 	"github.com/spf13/viper"
-	"path"
 )
 
 var AppConfig Config
@@ -48,13 +47,13 @@ type ETCD struct {
 }
 
 func InitConfig() (err error) {
-	baseDir, err := utils.GetCurrentPath("/conf")
+	baseDir, err := utils.GetCurrentPath("conf")
 	if err != nil {
 		return
 	}
 	viper.SetConfigName("app_config")
 	viper.SetConfigType("yaml")
-	viper.AddConfigPath(path.Join(baseDir, "../conf/"))
+	viper.AddConfigPath(baseDir)
 	if err = viper.ReadInConfig(); err != nil {
 		return
 	}

infra/logger/config.go

@@ -1,6 +1,7 @@
 package logger
 
 import (
+	"LAPP_ETL/utils"
 	"errors"
 	"github.com/spf13/viper"
 )
@@ -48,9 +49,13 @@ type outputSettings struct {
 
 func InitConfig() error {
 	var err error
+	baseDir, err := utils.GetCurrentPath("conf")
+	if err != nil {
+		return err
+	}
 	viper.SetConfigName("log_config")
 	viper.SetConfigType("yaml")
-	viper.AddConfigPath("./conf/")
+	viper.AddConfigPath(baseDir)
 	if err = viper.ReadInConfig(); err != nil {
 		return err
 	}