fix: load mml

This commit is contained in:
2023-11-24 10:29:06 +08:00
parent 4eacb3bd17
commit 57d33a536e

View File

@@ -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