From 57d33a536e7e26f0f054d442e0994095ad1d676b Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 24 Nov 2023 10:29:06 +0800 Subject: [PATCH] fix: load mml --- tools/loadmconf/load.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/loadmconf/load.go b/tools/loadmconf/load.go index dccf3677..268588fe 100644 --- a/tools/loadmconf/load.go +++ b/tools/loadmconf/load.go @@ -3,7 +3,6 @@ package main import ( "flag" "fmt" - "io/ioutil" "os" "gopkg.in/yaml.v3" @@ -39,7 +38,7 @@ type YamlConfig struct { var yamlConfig YamlConfig func ReadConfig(configFile string) { - yamlFile, err := ioutil.ReadFile(configFile) + yamlFile, err := os.ReadFile(configFile) if err != nil { fmt.Printf("ioutil.ReadFile %s err %v", configFile, err) } @@ -58,7 +57,7 @@ func GetYamlConfig() *YamlConfig { var mapYaml map[string]interface{} func ReadMMLConfig(fileName string) *map[string]interface{} { - file, err := ioutil.ReadFile(fileName) + file, err := os.ReadFile(fileName) if err != nil { fmt.Println("yamlFile.Get err", err) } @@ -67,7 +66,7 @@ func ReadMMLConfig(fileName string) *map[string]interface{} { err = yaml.Unmarshal(file, &mapYaml) if err != nil { - fmt.Println("yaml.Unmarshal: %v when to struct", err) + fmt.Printf("yaml.Unmarshal: %v when to struct\n", err) } // fmt.Println("mapYaml:", mapYaml) @@ -78,7 +77,7 @@ func GetAllFile(dir string, s []string) ([]string, error) { fmt.Println("GetAllFile processing...", dir) fmt.Println("dir:", dir) - rd, err := ioutil.ReadDir(dir) + rd, err := os.ReadDir(dir) if err != nil { fmt.Println("read dir fail:", err) return s, err