yjp 1 сар өмнө
parent
commit
f21cf7acdd

+ 1 - 1
yaml/yaml_loader/test.yaml

@@ -4,4 +4,4 @@ test1:
 ---
 
 test2:
-  name: "foo2"
+  name: "foo2"

+ 5 - 2
yaml/yaml_loader/yaml_loader.go

@@ -10,7 +10,7 @@ import (
 	"reflect"
 )
 
-type LoadMapCallback func(objectMap map[string]any)
+type LoadMapCallback func(objectMap map[string]any) error
 
 // LoadYamlFile 加载YAML文件,一个文件中可以有多个YAML对象
 // 参数:
@@ -116,7 +116,10 @@ func loadYamlMap(r io.Reader, callback LoadMapCallback) error {
 			return err
 		}
 
-		callback(object)
+		err = callback(object)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil