From 1fdf85e3b89a814b16c5a24d2419502a821216da Mon Sep 17 00:00:00 2001 From: heansheng <77931774@qq.com> Date: Sun, 28 Nov 2021 23:36:21 +0800 Subject: [PATCH 1/8] update MarshalJSON example --- os/gtime/gtime_z_example_time_test.go | 30 ++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/os/gtime/gtime_z_example_time_test.go b/os/gtime/gtime_z_example_time_test.go index 0ac899256..f4cb9adf3 100644 --- a/os/gtime/gtime_z_example_time_test.go +++ b/os/gtime/gtime_z_example_time_test.go @@ -467,11 +467,31 @@ func ExampleTime_EndOfYear() { } func ExampleTime_MarshalJSON() { - gt1 := gtime.New("2018-08-08 08:08:08") - - json, _ := gt1.MarshalJSON() - fmt.Println(string(json)) + type Person struct { + Name string `json:"name"` + Birthday *gtime.Time `json:"birthday"` + } + p := new(Person) + p.Name = "goframe" + p.Birthday = gtime.New("2018-08-08 08:08:08") + j, _ := json.Marshal(p) + fmt.Println(string(j)) // Output: - // "2018-08-08 08:08:08" + // {"name":"xiaoming","birthday":"2018-08-08 08:08:08"} +} + +func ExampleTime_UnmarshalJSON() { + type Person struct { + Name string `json:"name"` + Birthday *gtime.Time `json:"birthday"` + } + p := new(Person) + src := `{"name":"goframe","birthday":"2018-08-08 08:08:08"}` + json.Unmarshal([]byte(src), p) + js, _ := json.Marshal(p) + + fmt.Println(string(js)) + // Output: + // {"name":"goframe","birthday":"2018-08-08 08:08:08"} } From 2ead7606b226c0a5cdfa8363a40416053f14b3a3 Mon Sep 17 00:00:00 2001 From: ansionfor <77931774@qq.com> Date: Sun, 28 Nov 2021 23:41:41 +0800 Subject: [PATCH 2/8] go fmt --- os/gtime/gtime_z_example_time_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/os/gtime/gtime_z_example_time_test.go b/os/gtime/gtime_z_example_time_test.go index f4cb9adf3..21291438b 100644 --- a/os/gtime/gtime_z_example_time_test.go +++ b/os/gtime/gtime_z_example_time_test.go @@ -468,8 +468,8 @@ func ExampleTime_EndOfYear() { func ExampleTime_MarshalJSON() { type Person struct { - Name string `json:"name"` - Birthday *gtime.Time `json:"birthday"` + Name string `json:"name"` + Birthday *gtime.Time `json:"birthday"` } p := new(Person) p.Name = "goframe" @@ -483,8 +483,8 @@ func ExampleTime_MarshalJSON() { func ExampleTime_UnmarshalJSON() { type Person struct { - Name string `json:"name"` - Birthday *gtime.Time `json:"birthday"` + Name string `json:"name"` + Birthday *gtime.Time `json:"birthday"` } p := new(Person) src := `{"name":"goframe","birthday":"2018-08-08 08:08:08"}` From 3ff77a87d4ca2a9d5833ed6984543f7ab419bb46 Mon Sep 17 00:00:00 2001 From: ansionfor <77931774@qq.com> Date: Sun, 28 Nov 2021 23:57:49 +0800 Subject: [PATCH 3/8] add json --- os/gtime/gtime_z_example_time_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/os/gtime/gtime_z_example_time_test.go b/os/gtime/gtime_z_example_time_test.go index 21291438b..4d1a37fbc 100644 --- a/os/gtime/gtime_z_example_time_test.go +++ b/os/gtime/gtime_z_example_time_test.go @@ -8,6 +8,7 @@ package gtime_test import ( "fmt" + "json" "reflect" "time" From f754bdbb0e36e26038f31bad6104938860470535 Mon Sep 17 00:00:00 2001 From: heansheng <77931774@qq.com> Date: Mon, 29 Nov 2021 10:05:52 +0800 Subject: [PATCH 4/8] Update gtime_z_example_time_test.go --- os/gtime/gtime_z_example_time_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/gtime/gtime_z_example_time_test.go b/os/gtime/gtime_z_example_time_test.go index 4d1a37fbc..4666a34e1 100644 --- a/os/gtime/gtime_z_example_time_test.go +++ b/os/gtime/gtime_z_example_time_test.go @@ -8,7 +8,7 @@ package gtime_test import ( "fmt" - "json" + "encoding/json" "reflect" "time" From 578d8218bd4d6e288e1c072694ae02e55416511a Mon Sep 17 00:00:00 2001 From: ansionfor <77931774@qq.com> Date: Mon, 29 Nov 2021 10:08:12 +0800 Subject: [PATCH 5/8] go fmt --- os/gtime/gtime_z_example_time_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/gtime/gtime_z_example_time_test.go b/os/gtime/gtime_z_example_time_test.go index 4666a34e1..8aa6e0469 100644 --- a/os/gtime/gtime_z_example_time_test.go +++ b/os/gtime/gtime_z_example_time_test.go @@ -7,8 +7,8 @@ package gtime_test import ( - "fmt" "encoding/json" + "fmt" "reflect" "time" From 6acb2f46e6b2ff60754b7f935afc796eb92cd6e3 Mon Sep 17 00:00:00 2001 From: ansionfor <77931774@qq.com> Date: Mon, 29 Nov 2021 10:14:55 +0800 Subject: [PATCH 6/8] update gtime example --- os/gtime/gtime_z_example_time_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/gtime/gtime_z_example_time_test.go b/os/gtime/gtime_z_example_time_test.go index 8aa6e0469..581185046 100644 --- a/os/gtime/gtime_z_example_time_test.go +++ b/os/gtime/gtime_z_example_time_test.go @@ -479,7 +479,7 @@ func ExampleTime_MarshalJSON() { fmt.Println(string(j)) // Output: - // {"name":"xiaoming","birthday":"2018-08-08 08:08:08"} + // {"name":"goframe","birthday":"2018-08-08 08:08:08"} } func ExampleTime_UnmarshalJSON() { From 0340fb71244dab6da0abd656c56a9c68a1d31900 Mon Sep 17 00:00:00 2001 From: ansionfor <77931774@qq.com> Date: Tue, 30 Nov 2021 22:53:28 +0800 Subject: [PATCH 7/8] update gtime example --- os/gtime/gtime_z_example_time_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/os/gtime/gtime_z_example_time_test.go b/os/gtime/gtime_z_example_time_test.go index 581185046..b2a63fbd4 100644 --- a/os/gtime/gtime_z_example_time_test.go +++ b/os/gtime/gtime_z_example_time_test.go @@ -490,9 +490,8 @@ func ExampleTime_UnmarshalJSON() { p := new(Person) src := `{"name":"goframe","birthday":"2018-08-08 08:08:08"}` json.Unmarshal([]byte(src), p) - js, _ := json.Marshal(p) - fmt.Println(string(js)) - // Output: - // {"name":"goframe","birthday":"2018-08-08 08:08:08"} + fmt.Println(p) + // Output + // &{goframe 2018-08-08 08:08:08} } From 8f0c0337c532fec2e2ebf0dfe7ab49de40bed3f6 Mon Sep 17 00:00:00 2001 From: ansionfor <77931774@qq.com> Date: Tue, 30 Nov 2021 23:10:02 +0800 Subject: [PATCH 8/8] update gtime example output --- os/gtime/gtime_z_example_time_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/os/gtime/gtime_z_example_time_test.go b/os/gtime/gtime_z_example_time_test.go index b2a63fbd4..06f139334 100644 --- a/os/gtime/gtime_z_example_time_test.go +++ b/os/gtime/gtime_z_example_time_test.go @@ -492,6 +492,7 @@ func ExampleTime_UnmarshalJSON() { json.Unmarshal([]byte(src), p) fmt.Println(p) + // Output // &{goframe 2018-08-08 08:08:08} }