From 35f7e065f6f22da3aa0410714da0c3bc1680501a Mon Sep 17 00:00:00 2001
From: 520MianXiangDuiXiang520 <15364968962@163.com>
Date: Sat, 21 Aug 2021 11:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=9B=9E=E5=AE=98=E6=96=B9?=
 =?UTF-8?q?=E7=9A=84json=E8=A7=A3=E6=9E=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsondiff.go   | 14 +++++++++-----
 parse_test.go |  2 --
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/jsondiff.go b/jsondiff.go
index 0a59e7d..d807237 100644
--- a/jsondiff.go
+++ b/jsondiff.go
@@ -133,11 +133,13 @@ func GetDiffNode(sourceJsonNode, patchJsonNode *decode.JsonNode, options ...Json
 
 // AsDiffs 比较 patch 相比于 source 的差别，返回 json 格式的差异文档。
 func AsDiffs(source, patch []byte, options ...JsonDiffOption) ([]byte, error) {
-	sourceJsonNode, err := decode.Unmarshal(source)
+	// sourceJsonNode, err := decode.Unmarshal(source)
+    sourceJsonNode, err := Unmarshal(source)
 	if err != nil {
 		return nil, errors.Wrap(err, "fail to unmarshal src")
 	}
-	patchJsonNode, err := decode.Unmarshal(patch)
+	// patchJsonNode, err := decode.Unmarshal(patch)
+    patchJsonNode, err := Unmarshal(patch)
 	if err != nil {
 		return nil, errors.Wrap(err, "fail to unmarshal tar")
 	}
@@ -195,11 +197,13 @@ func merge(srcNode, diffNode *decode.JsonNode) error {
 
 // MergeDiff 根据差异文档 diff 还原 source 的差异
 func MergeDiff(source, diff []byte) ([]byte, error) {
-	diffNode, err := decode.Unmarshal(diff)
-	if err != nil {
+	// diffNode, err := decode.Unmarshal(diff)
+    diffNode, err := Unmarshal(diff)
+    if err != nil {
 		return nil, errors.Wrap(err, "fail to unmarshal diff data")
 	}
-	srcNode, err := decode.Unmarshal(source)
+	// srcNode, err := decode.Unmarshal(source)
+    srcNode, err := Unmarshal(source)
 	if err != nil {
 		return nil, errors.Wrap(err, "fail to unmarshal source data")
 	}
diff --git a/parse_test.go b/parse_test.go
index daa298b..505c51a 100644
--- a/parse_test.go
+++ b/parse_test.go
@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"github.com/520MianXiangDuiXiang520/json-diff/decode"
     `io/ioutil`
-    
-    // "io/ioutil"
 	"testing"
 )