Skip to content

Commit fc5e413

Browse files
committed
Layout
1 parent 91d3e0d commit fc5e413

File tree

6 files changed

+22
-21
lines changed

6 files changed

+22
-21
lines changed

format.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ package xtime
22

33
import "time"
44
func FormatChinaYear(t time.Time) string {
5-
return t.In(LocationChina).Format(layoutYear)
5+
return t.In(LocationChina).Format(LayoutYear)
66
}
77
func FormatChinaYearAndMonth(t time.Time) string {
8-
return t.In(LocationChina).Format(layoutYearAndMonth)
8+
return t.In(LocationChina).Format(LayoutYearAndMonth)
99
}
1010
func FormatChinaTime(t time.Time) string {
11-
return t.In(LocationChina).Format(layoutTime)
11+
return t.In(LocationChina).Format(LayoutTime)
1212
}
1313
func FormatChinaDate(t time.Time) string {
14-
return t.In(LocationChina).Format(layoutDate)
14+
return t.In(LocationChina).Format(LayoutDate)
1515
}
1616
func FormatChinaHourMinuteSecond(t time.Time) string {
17-
return t.In(LocationChina).Format(layoutHourMinuteSecond)
17+
return t.In(LocationChina).Format(LayoutHourMinuteSecond)
1818
}

json.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ func NewChinaTime(time time.Time) ChinaTime {
1313
return ChinaTime{Time: time.In(LocationChina)}
1414
}
1515
func (t ChinaTime) MarshalJSON() ([]byte, error) {
16-
return []byte(`"` + t.In(LocationChina).Format(layoutTime) + `"`), nil
16+
return []byte(`"` + t.In(LocationChina).Format(LayoutTime) + `"`), nil
1717
}
1818
func (t *ChinaTime) UnmarshalJSON(b []byte) error {
19-
v, err := time.ParseInLocation(`"` + layoutTime + `"`, string(b), LocationChina)
19+
v, err := time.ParseInLocation(`"` + LayoutTime + `"`, string(b), LocationChina)
2020
t.Time = v
2121
return err
2222
}

layout.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package xtime
22

3-
const layoutYear = "2006"
4-
const layoutYearAndMonth = "2006-01"
5-
const layoutDate = "2006-01-02"
6-
const layoutTime = "2006-01-02 15:04:05"
7-
const layoutHourMinuteSecond = "15:04:05"
3+
const LayoutYear = "2006"
4+
const LayoutYearAndMonth = "2006-01"
5+
const LayoutDate = "2006-01-02"
6+
const LayoutTime = "2006-01-02 15:04:05"
7+
const LayoutHourMinuteSecond = "15:04:05"

layout_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
)
77

88
func TestLayout(t *testing.T) {
9-
assert.Equal(t, layoutYear, "2006")
10-
assert.Equal(t, layoutYearAndMonth, "2006-01")
11-
assert.Equal(t, layoutDate, "2006-01-02")
12-
assert.Equal(t, layoutTime, "2006-01-02 15:04:05")
13-
assert.Equal(t, layoutHourMinuteSecond, "15:04:05")
9+
assert.Equal(t, LayoutYear, "2006")
10+
assert.Equal(t, LayoutYearAndMonth, "2006-01")
11+
assert.Equal(t, LayoutDate, "2006-01-02")
12+
assert.Equal(t, LayoutTime, "2006-01-02 15:04:05")
13+
assert.Equal(t, LayoutHourMinuteSecond, "15:04:05")
1414
}

parse.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import "time"
44

55

66
func ParseChinaYear(value string) (t time.Time, err error) {
7-
return time.ParseInLocation(layoutYear, value, LocationChina)
7+
return time.ParseInLocation(LayoutYear, value, LocationChina)
88
}
99
func ParseChinaYearAndMonth(value string) (t time.Time, err error) {
10-
return time.ParseInLocation(layoutYearAndMonth, value, LocationChina)
10+
return time.ParseInLocation(LayoutYearAndMonth, value, LocationChina)
1111
}
1212
func ParseChinaDate(value string) (t time.Time, err error) {
13-
return time.ParseInLocation(layoutDate, value, LocationChina)
13+
return time.ParseInLocation(LayoutDate, value, LocationChina)
1414
}
1515
func ParseChinaTime(value string) (t time.Time, err error) {
16-
return time.ParseInLocation(layoutTime, value, LocationChina)
16+
return time.ParseInLocation(LayoutTime, value, LocationChina)
1717
}

unix.go

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package xtime
22

33
import "time"
44

5+
// UnixMilli 老版本 go 没有 time.Time{}.UnixMilli() 方法,故此提供了 xtime.UnixMilli(t)
56
func UnixMilli(t time.Time) int64 {
67
return t.UnixNano() / 1e6
78
}

0 commit comments

Comments
 (0)