add： 添加对自定义time.time类型的支持

Author: liu-cn

filter/omit_encode.go

@@ -26,12 +26,17 @@ TakePointerValue: //取指针的值
 			}
 		}
 
-		if typeOf.String() == timeType { //是time.Time类型或者底层是time.Time类型
+		if valueOf.CanConvert(timeTypes) { //是time.Time类型或者底层是time.Time类型
 			t.Key = key
 			t.Val = valueOf.Interface()
-			return
 		}
 
+		//if typeOf.String() == timeType { //是time.Time类型或者底层是time.Time类型
+		//	t.Key = key
+		//	t.Val = valueOf.Interface()
+		//	return
+		//}
+
 		if typeOf.NumField() == 0 { //如果是一个struct{}{}类型的字段或者是一个空的自定义结构体编码为{}
 			t.Key = key
 			t.Val = struct{}{}

filter/select_encode.go

@@ -1,10 +1,15 @@
 package filter
 
 import (
+	"fmt"
 	"reflect"
+	"time"
 )
 
-var nilSlice = make([]int, 0, 0)
+var (
+	nilSlice  = make([]int, 0, 0)
+	timeTypes = reflect.TypeOf(time.Now())
+)
 
 const (
 	timeType = "time.Time"
@@ -33,12 +38,19 @@ TakePointerValue: //取指针的值
 			}
 		}
 
-		if typeOf.String() == timeType { //是time.Time类型或者底层是time.Time类型
+		fmt.Println(valueOf.CanConvert(timeTypes))
+		if valueOf.CanConvert(timeTypes) { //是time.Time类型或者底层是time.Time类型
 			t.Key = key
 			t.Val = valueOf.Interface()
 			return
 		}
 
+		//if typeOf.String() == timeType { //是time.Time类型或者底层是time.Time类型
+		//	t.Key = key
+		//	t.Val = valueOf.Interface()
+		//	return
+		//}
+
 		if typeOf.NumField() == 0 { //如果是一个struct{}{}类型的字段或者是一个空的自定义结构体编码为{}
 			t.Key = key
 			t.Val = struct{}{}

filter/time.go

@@ -0,0 +1,31 @@
+package filter
+
+import (
+	"fmt"
+	"time"
+)
+
+type Time time.Time
+
+const timeFmt = "2006-01-02 15:04:05"
+
+func (t Time) MarshalJSON() ([]byte, error) {
+	fmtTime := time.Time(t)
+	formatted := fmt.Sprintf("\"%s\"", fmtTime.Format(timeFmt))
+	return []byte(formatted), nil
+}
+
+func (t *Time) UnmarshalJSON(data []byte) error {
+	if string(data) == "null" {
+		return nil
+	}
+	var err error
+	var timeTmp time.Time
+	timeTmp, err = time.Parse(`"`+timeFmt+`"`, string(data))
+	*t = Time(timeTmp)
+	return err
+}
+
+func (t Time) String() string {
+	return time.Time(t).Format(timeFmt)
+}

filter/time_test.go

@@ -0,0 +1,45 @@
+package filter
+
+import (
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"testing"
+	"time"
+)
+
+type UserTime struct {
+	ID         int       `json:"id,select(list)"`
+	BirthTime  Time      `json:"birth_time,select(list)"`
+	BirthTime2 *Time     `json:"birth_time2,select(list)"`
+	Timer      time.Time `json:"timer,select($any)"`
+}
+
+func TestTime(t *testing.T) {
+	now := time.Now()
+	user := UserTime{
+		ID:         111,
+		BirthTime:  Time(now),
+		BirthTime2: (*Time)(&now),
+		Timer:      time.Now(),
+	}
+	v := reflect.ValueOf(Time{})
+	val, ok := v.Interface().(json.Marshaler)
+	fmt.Println(val, ok)
+
+	fmt.Println(SelectMarshal("list", user).MustJSON())
+
+	u2 := UserTime{}
+	marshal, err := json.Marshal(user)
+	if err != nil {
+		panic(err)
+	}
+
+	err = json.Unmarshal(marshal, &u2)
+	if err != nil {
+		panic(err)
+	}
+
+	fmt.Println(u2)
+	fmt.Println(u2.BirthTime)
+}