fix: update pkg/util/json (#223)

TencentBlueKing · Dec 12, 2022 · 52f2b92 · 52f2b92
1 parent f388fda
commit 52f2b92
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/pkg/util/json/go_json.go b/pkg/util/json/go_json.go
@@ -19,7 +19,10 @@
 
 package json
 
-import json "github.com/goccy/go-json"
+import (
+	"github.com/TencentBlueKing/gopkg/conv"
+	json "github.com/goccy/go-json"
+)
 
 var (
 	// Marshal is exported by gin/json package.
@@ -41,10 +44,10 @@ func MarshalToString(v interface{}) (string, error) {
 		return "", err
 	}
 
-	return string(json), nil
+	return conv.BytesToString(json), nil
 }
 
 // UnmarshalFromString is a convenient method to read from string instead of []byte
 func UnmarshalFromString(str string, v interface{}) error {
-	return Unmarshal([]byte(str), v)
+	return Unmarshal(conv.StringToBytes(str), v)
 }
diff --git a/pkg/util/json/json.go b/pkg/util/json/json.go
@@ -21,7 +21,11 @@
 
 package json
 
-import "encoding/json"
+import (
+	"encoding/json"
+
+	"github.com/TencentBlueKing/gopkg/conv"
+)
 
 var (
 	// Marshal is exported by gin/json package.
@@ -43,10 +47,10 @@ func MarshalToString(v interface{}) (string, error) {
 		return "", err
 	}
 
-	return string(json), nil
+	return conv.BytesToString(json), nil
 }
 
 // UnmarshalFromString is a convenient method to read from string instead of []byte
 func UnmarshalFromString(str string, v interface{}) error {
-	return Unmarshal([]byte(str), v)
+	return Unmarshal(conv.StringToBytes(str), v)
 }