From f212fa3046778c804198678275b30dc55e43d39a Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 12 Jan 2019 15:15:31 +0800 Subject: [PATCH] - TryStr2Time handle time zone info. --- utils/typeconv.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/typeconv.go b/utils/typeconv.go index d4a2c99d..1fe3e72e 100644 --- a/utils/typeconv.go +++ b/utils/typeconv.go @@ -261,12 +261,15 @@ func TryStr2Time(timeStr string) (time.Time, error) { if strings.Index(timeStr, " ") == -1 { timeStr += " 00:00:00" } + maxTimeStrLen := len("2018-05-03 09:18:40") + if len(timeStr) > maxTimeStrLen { + timeStr = timeStr[:maxTimeStrLen] + } return time.ParseInLocation("2006-1-2 15:4:5", timeStr, time.Local) } func Str2TimeWithDefault(timeStr string, defValue time.Time) time.Time { - timeStr = strings.Replace(timeStr, "T", " ", 1) - retVal, err := time.ParseInLocation("2006-1-2 15:4:5", timeStr, time.Local) + retVal, err := TryStr2Time(timeStr) if err != nil { return defValue }