fix: load env error

Author: tangx

env.go

@@ -22,8 +22,8 @@ func Marshal(v interface{}, prefix string) ([]byte, error) {
 return yaml.Marshal(m)
 }
 
-// UnmarshalFromEnv 从环境变量中赋值结构体
-func UnmarshalFromEnv(v interface{}, prefix string) (err error) {
+// LoadEnv 从环境变量中赋值结构体
+func LoadEnv(v interface{}, prefix string) (err error) {
 
 // 获取所有 key
 m := make(map[string]interface{})
@@ -37,7 +37,7 @@ func UnmarshalFromEnv(v interface{}, prefix string) (err error) {
 m[key] = os.Getenv(key)
 }
 
-return
+return unmarshal(v, prefix)
 }
 
 func Output(data []byte, w io.Writer) error {

env_test.go

@@ -1,11 +1,10 @@
 package envutils
 
 import (
+"log"
 "os"
 "testing"
 
-"log"
-
 "gopkg.in/yaml.v3"
 )
 
@@ -22,14 +21,19 @@ type addr struct {
 School string `env:"school"`
 }
 
+var (
+_ = os.Setenv("APP__Stud01_Name", "zhugeliang")
+_ = os.Setenv("APP__Stud01_Age", "500")
+_ = os.Setenv("APP__Stud01_Gender", "true")
+_ = os.Setenv("APP__Stud01__addr_home", "addr: sichuan")
+_ = os.Setenv("APP__Stud01__addr2_home", "addr2: sichuan")
+_ = os.Setenv("APP__Addr_home", "zhongguo,sichuan,chengdu")
+_ = os.Setenv("APP__Addr_Home", "APP__Addr_Home")
+
+APPNAME = "APP"
+)
+
 func Test_marshal(t *testing.T) {
-os.Setenv("APP__Stud01_Name", "zhugeliang")
-os.Setenv("APP__Stud01_Age", "500")
-os.Setenv("APP__Stud01_Gender", "true")
-os.Setenv("APP__Stud01__addr_home", "addr: sichuan")
-os.Setenv("APP__Stud01__addr2_home", "addr2: sichuan")
-os.Setenv("APP__Addr_home", "zhongguo,sichuan,chengdu")
-os.Setenv("APP__Addr_Home", "APP__Addr_Home")
 stu := student{
 Name: "zhangsan2",
 Age: 20,
@@ -43,39 +47,40 @@ func Test_marshal(t *testing.T) {
 School: "chengdu",
 },
 }
-
-// stu02 := student{}
-
 config := &struct {
 Stud01 *student
-// Person student
-Addr addr
-// Stud02 *student
-// Address addr
+Addr addr
 }{
 Stud01: &stu,
-// Person: stu,
-Addr: addr{},
-// Stud02: &stu02,
+Addr: addr{},
 }
 
-/* public */
-var b []byte
-var err error
-
 /* marshal */
-b, _ = Marshal(config, "APP")
+b, _ := Marshal(config, "APP")
 _ = Output(b, os.Stdout)
 
+}
+
+func Test_LoadEnv(t *testing.T) {
+stu := student{}
+config := &struct {
+Stud01 *student
+Addr addr
+}{
+Stud01: &stu,
+Addr: addr{},
+}
+
+LoadEnv(config, APPNAME)
 /* unmarshal */
-err = unmarshal(config, "APP")
-// fmt.Println(err)
+err := LoadEnv(config, APPNAME)
 if err != nil {
-log.Fatal(err.Error())
+log.Fatal(err)
 }
-b, err = yaml.Marshal(config)
+
+b, err := yaml.Marshal(config)
 if err != nil {
-log.Fatal(err.Error())
+log.Fatal(err)
 }
 _ = Output(b, os.Stdout)
 }