From 86433cef259bbcb05494e54c099c6eff4708054e Mon Sep 17 00:00:00 2001
From: John <john@johng.cn>
Date: Fri, 18 Sep 2020 23:59:49 +0800
Subject: [PATCH] improve gtime.New, gconv.String

---
 os/gtime/gtime_time.go | 15 ++++++++++++++-
 util/gconv/gconv.go    |  8 ++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/os/gtime/gtime_time.go b/os/gtime/gtime_time.go
index 5ed92c855..00a452f74 100644
--- a/os/gtime/gtime_time.go
+++ b/os/gtime/gtime_time.go
@@ -17,13 +17,21 @@ type Time struct {
 	TimeWrapper
 }
 
+// apiUnixNano is an interface definition commonly for custom time.Time wrapper.
+type apiUnixNano interface {
+	UnixNano() int64
+}
+
 // New creates and returns a Time object with given parameter.
-// The optional parameter can be type of: time.Time, string or integer.
+// The optional parameter can be type of: time.Time/*time.Time, string or integer.
 func New(param ...interface{}) *Time {
 	if len(param) > 0 {
 		switch r := param[0].(type) {
 		case time.Time:
+			r.Nanosecond()
 			return NewFromTime(r)
+		case *time.Time:
+			return NewFromTime(*r)
 		case string:
 			return NewFromStr(r)
 		case []byte:
@@ -32,6 +40,10 @@ func New(param ...interface{}) *Time {
 			return NewFromTimeStamp(int64(r))
 		case int64:
 			return NewFromTimeStamp(r)
+		default:
+			if v, ok := r.(apiUnixNano); ok {
+				return NewFromTimeStamp(v.UnixNano())
+			}
 		}
 	}
 	return &Time{
@@ -84,6 +96,7 @@ func NewFromStrLayout(str string, layout string) *Time {
 
 // NewFromTimeStamp creates and returns a Time object with given timestamp,
 // which can be in seconds to nanoseconds.
+// Eg: 1600443866 and 1600443866199266000 are both considered as valid timestamp number.
 func NewFromTimeStamp(timestamp int64) *Time {
 	if timestamp == 0 {
 		return &Time{}
diff --git a/util/gconv/gconv.go b/util/gconv/gconv.go
index c582c822c..fc0b5fb82 100644
--- a/util/gconv/gconv.go
+++ b/util/gconv/gconv.go
@@ -381,8 +381,10 @@ func String(i interface{}) string {
 			return f.Error()
 		}
 		// Reflect checks.
-		rv := reflect.ValueOf(value)
-		kind := rv.Kind()
+		var (
+			rv   = reflect.ValueOf(value)
+			kind = rv.Kind()
+		)
 		switch kind {
 		case reflect.Chan,
 			reflect.Map,
@@ -394,6 +396,8 @@ func String(i interface{}) string {
 			if rv.IsNil() {
 				return ""
 			}
+		case reflect.String:
+			return rv.String()
 		}
 		if kind == reflect.Ptr {
 			return String(rv.Elem().Interface())