diff --git a/pkg/u/u.go b/pkg/u/u.go index c757a5b..6a0c1c3 100644 --- a/pkg/u/u.go +++ b/pkg/u/u.go @@ -91,14 +91,14 @@ func DateTail(date time.Time) time.Time { return time.Date(y, m, d, 23, 59, 59, 999999999, time.Local).UTC() } -func Today() time.Time { - return DateHead(time.Now()) +func IsSameDate(date1, date2 time.Time) bool { + var y1, m1, d1 = date1.Local().Date() + var y2, m2, d2 = date2.Local().Date() + return y1 == y2 && m1 == m2 && d1 == d2 } -func IsSameDate(date1, date2 time.Time) bool { - var y1, m1, d1 = date1.Date() - var y2, m2, d2 = date2.Date() - return y1 == y2 && m1 == m2 && d1 == d2 +func Today() time.Time { + return DateHead(time.Now()) } func IsToday(date time.Time) bool { diff --git a/web/services/channel.go b/web/services/channel.go index 211f2e3..fb35d67 100644 --- a/web/services/channel.go +++ b/web/services/channel.go @@ -157,7 +157,7 @@ func findResource(resourceId int32, now time.Time) (*ResourceView, error) { var sub = resource.Long info.LongId = &sub.ID info.ExpireAt = sub.ExpireAt - info.Live = time.Duration(sub.Live) * time.Hour + info.Live = time.Duration(sub.Live) * time.Minute info.Mode = sub.Type info.Quota = sub.Quota info.Used = sub.Used