@@ -133,11 +133,13 @@ func GetDiffNode(sourceJsonNode, patchJsonNode *decode.JsonNode, options ...Json
133133
134134// AsDiffs 比较 patch 相比于 source 的差别,返回 json 格式的差异文档。
135135func AsDiffs (source , patch []byte , options ... JsonDiffOption ) ([]byte , error ) {
136- sourceJsonNode , err := decode .Unmarshal (source )
136+ // sourceJsonNode, err := decode.Unmarshal(source)
137+ sourceJsonNode , err := Unmarshal (source )
137138 if err != nil {
138139 return nil , errors .Wrap (err , "fail to unmarshal src" )
139140 }
140- patchJsonNode , err := decode .Unmarshal (patch )
141+ // patchJsonNode, err := decode.Unmarshal(patch)
142+ patchJsonNode , err := Unmarshal (patch )
141143 if err != nil {
142144 return nil , errors .Wrap (err , "fail to unmarshal tar" )
143145 }
@@ -195,11 +197,13 @@ func merge(srcNode, diffNode *decode.JsonNode) error {
195197
196198// MergeDiff 根据差异文档 diff 还原 source 的差异
197199func MergeDiff (source , diff []byte ) ([]byte , error ) {
198- diffNode , err := decode .Unmarshal (diff )
199- if err != nil {
200+ // diffNode, err := decode.Unmarshal(diff)
201+ diffNode , err := Unmarshal (diff )
202+ if err != nil {
200203 return nil , errors .Wrap (err , "fail to unmarshal diff data" )
201204 }
202- srcNode , err := decode .Unmarshal (source )
205+ // srcNode, err := decode.Unmarshal(source)
206+ srcNode , err := Unmarshal (source )
203207 if err != nil {
204208 return nil , errors .Wrap (err , "fail to unmarshal source data" )
205209 }
0 commit comments