remove xjson

Author: nimoc

example_test.go

@@ -1,7 +1,7 @@
 package xtime_test
 
 import (
-	xjson "github.com/goclub/json"
+	json "encoding/json"
 	xtime "github.com/goclub/time"
 	"log"
 	"testing"
@@ -66,29 +66,29 @@ func ExampleJSON_RFC3339() {
 	request := struct {
 		Time time.Time `json:"time"`
 	}{}
-	err := xjson.Unmarshal([]byte(`{"time": "2020-12-31T23:23:23Z"}`), &request) ; if err != nil {panic(err)}
+	err := json.Unmarshal([]byte(`{"time": "2020-12-31T23:23:23Z"}`), &request) ; if err != nil {panic(err)}
 	log.Printf("request: %+v", request) // request: {Time:2020-12-31 23:23:23 +0000 UTC}
 
 	response := struct {
 		Time time.Time `json:"time"`
 	}{Time: time.Date(2020,12,31,23,23,23, 0,time.UTC)}
-	data, err := xjson.Marshal(response) ; if err != nil {panic(err)}
+	data, err := json.Marshal(response) ; if err != nil {panic(err)}
 	log.Print("response json : " + string(data)) // response json : {"time":"2020-12-31T23:23:23Z"}
 }
 func ExampleChinaTime () {
 	log.Print("ExampleChinaTime")
 	request := struct {
 		Time xtime.ChinaTime `json:"time"`
 	}{}
-	err := xjson.Unmarshal([]byte(`{"time": "2020-12-31 23:23:23"}`), &request) ; if err != nil {panic(err)}
+	err := json.Unmarshal([]byte(`{"time": "2020-12-31 23:23:23"}`), &request) ; if err != nil {panic(err)}
 	log.Printf("request: %+v", request) // request: {Time:2020-12-31 23:23:23 +0800 CST}
 	var sometime time.Time
 	sometime = request.Time.Time
 	log.Print(sometime)
 	response := struct {
 		Time xtime.ChinaTime `json:"time"`
 	}{Time: xtime.NewChinaTime(time.Date(2020,12,31,23,23,23, 0,time.UTC))}
-	data, err := xjson.Marshal(response) ; if err != nil {panic(err)}
+	data, err := json.Marshal(response) ; if err != nil {panic(err)}
 	log.Print("response json : " + string(data)) // response json : {"time":"2021-01-01 07:23:23"}
 }
 func TestExample(t *testing.T) {

go.mod

@@ -5,6 +5,5 @@ go 1.13
 require (
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/goclub/error v0.0.0-20220203142532-3d4dac42a2ff
-	github.com/goclub/json v0.0.0-20201212033753-4350fe0a941e
 	github.com/stretchr/testify v1.6.1
 )

go.sum

@@ -4,8 +4,6 @@ github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfC
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/goclub/error v0.0.0-20220203142532-3d4dac42a2ff h1:wCHleJjPYHwUkFFvsWDN0rTaVK0HbmK+tYG6ObZ/nRs=
 github.com/goclub/error v0.0.0-20220203142532-3d4dac42a2ff/go.mod h1:2ombCAL3uNuhVNevp56iOpelgiQIyxlYkz7t6nWEC18=
-github.com/goclub/json v0.0.0-20201212033753-4350fe0a941e h1:f/k5Ym11yl5ZXT12kQRuI1OFI+j66ubwLHCm6i+Mg9E=
-github.com/goclub/json v0.0.0-20201212033753-4350fe0a941e/go.mod h1:K7bX26XRz/QHEzyXUZNCYwN8yQsrfedeC1hhsE9HcRk=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

json_test.go

@@ -1,15 +1,18 @@
 package xtime
 
 import (
-	xjson "github.com/goclub/json"
+	json "encoding/json"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
 )
-		
+
 func TestChinaTime(t *testing.T) {
-	String := func (v interface{}) string {
-		data, err := xjson.Marshal(v) ; if err != nil {panic(err)}
+	String := func(v interface{}) string {
+		data, err := json.Marshal(v)
+		if err != nil {
+			panic(err)
+		}
 		return string(data)
 	}
 	{
@@ -32,7 +35,7 @@ func TestChinaTime(t *testing.T) {
 			Time ChinaTime `db:"time"`
 		}
 		req := Request{}
-		err := xjson.Unmarshal([]byte(`{"time":"2020-07-31 15:37:44"}`), &req)
+		err := json.Unmarshal([]byte(`{"time":"2020-07-31 15:37:44"}`), &req)
 		assert.NoError(t, err)
 		assert.Equal(t, req.Time.In(time.FixedZone("CST", 8*3600)).String(), "2020-07-31 15:37:44 +0800 CST")
 	}
@@ -46,4 +49,4 @@ func TestChinaTime(t *testing.T) {
 		reply.Time = NewChinaTime(tValue)
 		assert.Equal(t, reply.Time.String(), "2020-07-31 23:29:29 +0800 CST")
 	}
-}
+}