Skip to content

fix(os/gtime): fix gtime time string handle logic #4409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hailaz merged 2 commits into from
Sep 3, 2025
Merged

fix(os/gtime): fix gtime time string handle logic #4409

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffcd924
fix gtime time string handle logic
Zjmainstay Sep 2, 2025
490dbf1
fix: 修正时间字符串验证逻辑，小时范围调整为0-23
hailaz Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions os/gtime/gtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,14 +222,13 @@ func StrToTime(str string, format ...string) (*Time, error) {
} else if match = timeRegex2.FindStringSubmatch(str); len(match) > 0 && match[1] != "" {
year, month, day = parseDateStr(match[1])
} else if match = timeRegex3.FindStringSubmatch(str); len(match) > 0 && match[1] != "" {
s := strings.ReplaceAll(match[2], ":", "")
if len(s) < 6 {
s += strings.Repeat("0", 6-len(s))
}
hour, _ = strconv.Atoi(match[1])
min, _ = strconv.Atoi(match[2])
sec, _ = strconv.Atoi(match[3])
nsec, _ = strconv.Atoi(match[4])
if hour > 24 || min > 59 || sec > 59 {
return nil, gerror.NewCodef(gcode.CodeInvalidParameter, `invalid time string "%s"`, str)
}
for i := 0; i < 9-len(match[4]); i++ {
nsec *= 10
}
Expand All @@ -240,13 +239,19 @@ func StrToTime(str string, format ...string) (*Time, error) {

// Time
if len(match[2]) > 0 {
s := strings.ReplaceAll(match[2], ":", "")
if len(s) < 6 {
s += strings.Repeat("0", 6-len(s))
parts := strings.Split(match[2], ":")
if len(parts) >= 1 && parts[0] != "" {
hour, _ = strconv.Atoi(parts[0])
}
if len(parts) >= 2 && parts[1] != "" {
min, _ = strconv.Atoi(parts[1])
}
if len(parts) >= 3 && parts[2] != "" {
sec, _ = strconv.Atoi(parts[2])
}
if hour > 24 || min > 59 || sec > 59 {
return nil, gerror.NewCodef(gcode.CodeInvalidParameter, `invalid time string "%s"`, str)
}
hour, _ = strconv.Atoi(s[0:2])
min, _ = strconv.Atoi(s[2:4])
sec, _ = strconv.Atoi(s[4:6])
}
// Nanoseconds, check and perform bits filling
if len(match[3]) > 0 {
Expand Down
40 changes: 40 additions & 0 deletions os/gtime/gtime_z_unit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,46 @@ func Test_StrToTime(t *testing.T) {
}
}

// test special time string
var testSpecialDateTimes = []string{
"2006-01-02 8:04:05",
"2006-01-02 8:4:05",
"2006-01-02 8:4:5",
"2006-01-02 8:04:05.000",
"2006/01/02 8:4:5",
"2006.01.02 8:4:5.000",
"2006.01.02 - 8:4:5",
"2006.01.02 8:4:5 +0800 CST",
"2006-01-02T5:5:5+05:01",
"2006-01-01T19:3:5-05:01",
"2006-01-02T8:4:5",
"02-jan-2006 8:4:5",
"02/jan/2006 8:4:5",
"02.jan.2006 8:4:5",
"02.jan.2006:8:4:5",
}
for _, item := range testSpecialDateTimes {
timeTemp, err := gtime.StrToTime(item)
t.AssertNil(err)
t.Assert(timeTemp.Time.Local().Format("2006-01-02 15:04:05"), "2006-01-02 08:04:05")
}

// test error time string
var testErrorDateTimes = []string{
"2006-01-02 28:4:5",
"2006-01-02 8:60:5",
"2006-01-02 8:4:60",
"28:20:20",
"8:60:20",
"8:20:60",
}
for _, item := range testErrorDateTimes {
_, err := gtime.StrToTime(item)
if err == nil {
t.Error("test fail")
}
}

// test err
_, err := gtime.StrToTime("2006-01-02 15:04:05", "aabbccdd")
if err == nil {
Expand Down
Loading