Skip to content
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

Jump to bottom

Make GTime support multiple formats #2933

Merged
merged 7 commits into from
Sep 13, 2023
Merged

Make GTime support multiple formats #2933

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
36783ca
Make GTime support multiple formats
bigger-boss Sep 5, 2023
f4ec81e
Merge branch 'master' into master
bigger-boss Sep 11, 2023
16dc7f1
Make ParseTimeFromContent support multiple formats and edit theirs co…
bigger-boss Sep 11, 2023
48ab8b8
Merge branch 'master' of github.com:bigger-boss/gf
bigger-boss Sep 11, 2023
1085136
Add dot . at the end of the line.
bigger-boss Sep 13, 2023
a9ab8be
Merge branch 'gogf:master' into master
bigger-boss Sep 13, 2023
fb99f97
Merge branch 'master' of github.com:bigger-boss/gf
bigger-boss Sep 13, 2023
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
9 changes: 7 additions & 2 deletions util/gconv/gconv_time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,13 @@ func GTime(any interface{}, format ...string) *gtime.Time {
}
// Priority conversion using given format.
if len(format) > 0 {
t, _ := gtime.StrToTimeFormat(s, format[0])
return t
for _, item := range format {
t, err := gtime.StrToTimeFormat(s, item)
if t != nil && err == nil {
return t
}
}
return nil
bigger-boss marked this conversation as resolved.
Show resolved Hide resolved
}
if utils.IsNumeric(s) {
return gtime.NewFromTimeStamp(Int64(s))
Expand Down
Loading