From 7bfd60be8673abeca832f96d22cfbcbb3bfd3ca2 Mon Sep 17 00:00:00 2001 From: alick-liming Date: Mon, 25 Jan 2021 10:28:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8E=92=E8=A1=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=86=85=E7=BD=AE=E7=A7=9F=E6=88=B7=20(#544)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: alickliming --- src/modules/rdb/http/router_resource.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/rdb/http/router_resource.go b/src/modules/rdb/http/router_resource.go index cd39d950..b0fa5afb 100644 --- a/src/modules/rdb/http/router_resource.go +++ b/src/modules/rdb/http/router_resource.go @@ -602,7 +602,7 @@ func tenantResourcesCountRank(c *gin.Context) { resMap := make(map[string]int, 50) for _, res := range ress { tenant := res.Tenant - if tenant != "" { + if tenant != "" && tenant != "inner" { if _, ok := resMap[tenant]; !ok { resMap[tenant] = 0 } @@ -650,9 +650,17 @@ func projectResourcesCountRank(c *gin.Context) { } // 获取全部project - projectNodes, err := models.NodeGets("cate=?", "project") + projectAllNodes, err := models.NodeGets("cate=?", "project") dangerous(err) + var projectNodes []models.Node + for _, p := range projectAllNodes { + tenant := p.Tenant() + if tenant != "inner" { + projectNodes = append(projectNodes, p) + } + } + projectNodesLen := len(projectNodes) workerNum := 50 if projectNodesLen < workerNum {