- TryStr2Time
This commit is contained in:
@@ -214,17 +214,21 @@ func Time2Str(t time.Time) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func Str2Time(timeStr string) time.Time {
|
func Str2Time(timeStr string) time.Time {
|
||||||
timeStr = strings.Replace(timeStr, "T", " ", 1)
|
retVal, err := TryStr2Time(timeStr)
|
||||||
if strings.Index(timeStr, " ") == -1 {
|
|
||||||
timeStr += " 00:00:00"
|
|
||||||
}
|
|
||||||
retVal, err := time.ParseInLocation("2006-1-2 15:4:5", timeStr, time.Local)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
baseapi.SugarLogger.Errorf("time.ParseInLocation failed, timeStr:%v, error:%v", timeStr, err)
|
baseapi.SugarLogger.Errorf("time.ParseInLocation failed, timeStr:%v, error:%v", timeStr, err)
|
||||||
}
|
}
|
||||||
return retVal
|
return retVal
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TryStr2Time(timeStr string) (time.Time, error) {
|
||||||
|
timeStr = strings.Replace(timeStr, "T", " ", 1)
|
||||||
|
if strings.Index(timeStr, " ") == -1 {
|
||||||
|
timeStr += " 00:00:00"
|
||||||
|
}
|
||||||
|
return time.ParseInLocation("2006-1-2 15:4:5", timeStr, time.Local)
|
||||||
|
}
|
||||||
|
|
||||||
func Str2TimeWithDefault(timeStr string, defValue time.Time) time.Time {
|
func Str2TimeWithDefault(timeStr string, defValue time.Time) time.Time {
|
||||||
timeStr = strings.Replace(timeStr, "T", " ", 1)
|
timeStr = strings.Replace(timeStr, "T", " ", 1)
|
||||||
retVal, err := time.ParseInLocation("2006-1-2 15:4:5", timeStr, time.Local)
|
retVal, err := time.ParseInLocation("2006-1-2 15:4:5", timeStr, time.Local)
|
||||||
|
|||||||
Reference in New Issue
Block a user