|
@@ -32,14 +32,15 @@ func IsDate(s string) bool {
|
|
|
|
|
|
// StrToTime 字符串转时间
|
|
|
func StrToTime(s string) (t time.Time, err error) {
|
|
|
- t, err = time.ParseInLocation(TimeFmtLong, s, time.Local)
|
|
|
-
|
|
|
+ //t, err = time.ParseInLocation(TimeFmtLong, s, time.Local)
|
|
|
+ t, err = time.Parse(TimeFmtLong, s)
|
|
|
return
|
|
|
}
|
|
|
|
|
|
// StrFmtTime 时间转字符串
|
|
|
func StrFmtTime(s, fmt string) (t time.Time, err error) {
|
|
|
- t, err = time.ParseInLocation(fmt, s, time.Local)
|
|
|
+ //t, err = time.ParseInLocation(fmt, s, time.Local)
|
|
|
+ t, err = time.Parse(fmt, s)
|
|
|
return
|
|
|
}
|
|
|
|