go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/go-playground/validator/v10 v10.11.1
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/json-iterator/go v1.1.12
-	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.14.0
 	github.com/stretchr/testify v1.8.1
 	go.uber.org/zap v1.24.0
@@ -37,6 +36,7 @@ require (
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect

myconf/conf.go

@@ -4,63 +4,43 @@ import (
 	"fmt"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	"log"
 )
 
-type Config struct {
-	*viper.Viper
-}
-
 var (
-	conf = &Config{Viper: viper.New()}
+	vp = viper.New()
 )
 
-// 加载命令行参数
 func LoadFlag() {
 	if !pflag.Parsed() {
 		pflag.Parse()
 	}
-	err := conf.BindPFlags(pflag.CommandLine)
+	err := vp.BindPFlags(pflag.CommandLine)
 	if err != nil {
 		panic(fmt.Errorf("load command line fail: %s", err))
 	}
 }
 
-// 指定文件加载
 func LoadFile(confFile string) {
-	log.Printf("read conf file: %s", confFile)
+	vp.SetConfigFile(confFile)
-
+	err := vp.ReadInConfig()
-	conf.SetConfigFile(confFile)
-	err := conf.ReadInConfig()
 	if err != nil {
 		panic(fmt.Errorf("read file fail: %s", err))
 	}
 }
 
-func Conf() *Config {
+func LoadFileTo(confFile string, conf interface{}) {
-	return conf
+	vp.SetConfigFile(confFile)
+	err := vp.ReadInConfig()
+	if err != nil {
+		panic(fmt.Errorf("read file fail: %s", err))
+	}
+
+	err = vp.Unmarshal(conf)
+	if err != nil {
+		panic(fmt.Errorf("parse file fail: %s", err))
+	}
 }
 
-func (c *Config) GetStringDefault(key, defaultVal string) string {
+func Conf() *viper.Viper {
-	v := c.GetString(key)
+	return vp
-	if v == "" {
-		return defaultVal
-	}
-	return v
-}
-
-func (c *Config) GetIntDefault(key string, defaultVal int) int {
-	v := c.GetString(key) // 未设置 空字符串
-	if v == "" {
-		return defaultVal
-	}
-	return c.GetInt(key)
-}
-
-func (c *Config) GetBoolDefault(key string, defaultVal bool) bool {
-	v := c.GetString(key) // 未设置 空字符串
-	if v == "" {
-		return defaultVal
-	}
-	return c.GetBool(key)
 }

myconf/conf_test.go

@@ -0,0 +1,25 @@
+package myconf
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestConf(t *testing.T) {
+	type Config struct {
+		App struct {
+			Name string
+			Addr string
+			Port int
+		}
+
+		Redis struct {
+			Addr string
+			Db   int
+		}
+	}
+
+	var config = &Config{}
+	LoadFile("test.yaml", config)
+	fmt.Printf("%+v\n", config)
+}