diff --git a/internal/logic/admin/log/filterTrafficLogDetailsLogic.go b/internal/logic/admin/log/filterTrafficLogDetailsLogic.go index 479191e..5d2b488 100644 --- a/internal/logic/admin/log/filterTrafficLogDetailsLogic.go +++ b/internal/logic/admin/log/filterTrafficLogDetailsLogic.go @@ -37,6 +37,11 @@ func (l *FilterTrafficLogDetailsLogic) FilterTrafficLogDetails(req *types.Filter } start = day end = day.Add(24*time.Hour - time.Nanosecond) + } else { + // query today + now := time.Now() + start = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) + end = start.Add(24*time.Hour - time.Nanosecond) } var data []*traffic.TrafficLog tx := l.svcCtx.DB.WithContext(l.ctx).Model(&traffic.TrafficLog{}) diff --git a/internal/logic/subscribe/subscribeLogic.go b/internal/logic/subscribe/subscribeLogic.go index 4c64522..f523e89 100644 --- a/internal/logic/subscribe/subscribeLogic.go +++ b/internal/logic/subscribe/subscribeLogic.go @@ -216,7 +216,7 @@ func (l *SubscribeLogic) getServers(userSub *user.Subscribe) ([]*node.Node, erro Page: 1, Size: 1000, ServerId: nodeIds, - Tag: tags, + Tag: tool.RemoveDuplicateElements(tags...), Preload: true, })