From 790f8c80326c06253fde76d9c02ce56fe4c404cd Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sun, 19 Sep 2021 16:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=BA=90=E7=89=88=E6=9C=AC=E4=B9=9F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9F=9F=E5=90=8D=E6=8E=92=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/rpc/services/service_admin.go | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/internal/rpc/services/service_admin.go b/internal/rpc/services/service_admin.go index cd99c34c..d93097cc 100644 --- a/internal/rpc/services/service_admin.go +++ b/internal/rpc/services/service_admin.go @@ -569,7 +569,7 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com }) } - // 是否是企业版 + // 是否是商业版 isPlus, err := authority.SharedAuthorityKeyDAO.IsPlus(tx) if err != nil { return nil, err @@ -671,19 +671,17 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com } // 域名排行 - if isPlus { - topDomainStats, err := stats.SharedServerDomainHourlyStatDAO.FindTopDomainStats(tx, hourFrom, hourTo, 10) - if err != nil { - return nil, err - } - for _, stat := range topDomainStats { - result.TopDomainStats = append(result.TopDomainStats, &pb.ComposeAdminDashboardResponse_DomainStat{ - ServerId: int64(stat.ServerId), - Domain: stat.Domain, - CountRequests: int64(stat.CountRequests), - Bytes: int64(stat.Bytes), - }) - } + topDomainStats, err := stats.SharedServerDomainHourlyStatDAO.FindTopDomainStats(tx, hourFrom, hourTo, 10) + if err != nil { + return nil, err + } + for _, stat := range topDomainStats { + result.TopDomainStats = append(result.TopDomainStats, &pb.ComposeAdminDashboardResponse_DomainStat{ + ServerId: int64(stat.ServerId), + Domain: stat.Domain, + CountRequests: int64(stat.CountRequests), + Bytes: int64(stat.Bytes), + }) } // 节点排行