修复gtime时间解析问题

This commit is contained in:
john 2018-11-06 17:42:01 +08:00
parent 1608a96d98
commit 9fedea009d
2 changed files with 9 additions and 15 deletions

View File

@ -156,7 +156,7 @@ func StrToTime(str string, format...string) (*Time, error) {
} }
var year, month, day int var year, month, day int
var hour, min, sec, nsec int var hour, min, sec, nsec int
var array, match []string var match []string
var local = time.Local var local = time.Local
if match = timeRegex1.FindStringSubmatch(str); len(match) > 0 { if match = timeRegex1.FindStringSubmatch(str); len(match) > 0 {
for k, v := range match { for k, v := range match {
@ -179,12 +179,8 @@ func StrToTime(str string, format...string) (*Time, error) {
s += strings.Repeat("0", 6 - len(s)) s += strings.Repeat("0", 6 - len(s))
} }
hour, _ = strconv.Atoi(s[0 : 2]) hour, _ = strconv.Atoi(s[0 : 2])
if len(array) >= 2 { min, _ = strconv.Atoi(s[2 : 4])
min, _ = strconv.Atoi(s[2 : 4]) sec, _ = strconv.Atoi(s[4 : 6])
}
if len(array) >= 3 {
sec, _ = strconv.Atoi(s[4 : 6])
}
} }
// 纳秒,检查并执行位补齐 // 纳秒,检查并执行位补齐
if len(match[3]) > 0 { if len(match[3]) > 0 {

View File

@ -2,15 +2,13 @@ package main
import ( import (
"fmt" "fmt"
"gitee.com/johng/gf/g/util/gutil" "gitee.com/johng/gf/g/os/gtime"
) )
func main() { func main() {
gutil.TryCatch(func() { s := `
fmt.Println(1) 172.20.1.198 - - [2018-11-06T16:26:09+08:00] "POST /passport HTTP/1.1" "OK" 1 200 0.000 0.035 0.035 0.035 448 "-" "-" "-" "{\x22jsonrpc\x22:\x222.0\x22,\x22method\x22:\x22getSessionInfo\x22,\x22params\x22:[\x2262703819__6augmxzV9f5c7o4MEimnMqPhoyKWPi8pXjs2VIj3T43vBfuGZOJ9DxrbRNsFB0ew\x22,true,{\x22platform\x22:\x22web-ph\x22}],\x22id\x22:1}" http unix:/var/run/php/php5.6-fpm.sock med3-svr [med3-svr-65494945bf-jppth] "" "" "" [med3-svr-65494945bf-jppth]
panic("error") `
fmt.Println(2)
}, func(err interface{}) { fmt.Println(gtime.ParseTimeFromContent(s))
fmt.Println(err)
})
} }