diff --git a/internal/web/actions/default/clusters/cluster/node/logs.go b/internal/web/actions/default/clusters/cluster/node/logs.go index dc301c56..0ac46d09 100644 --- a/internal/web/actions/default/clusters/cluster/node/logs.go +++ b/internal/web/actions/default/clusters/cluster/node/logs.go @@ -4,6 +4,7 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils/nodelogutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/maps" timeutil "github.com/iwind/TeaGo/utils/time" @@ -43,7 +44,7 @@ func (this *LogsAction) RunGet(params struct { this.Data["tag"] = params.Tag countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{ - Role: "node", + Role: nodeconfigs.NodeRoleNode, NodeId: params.NodeId, DayFrom: params.DayFrom, DayTo: params.DayTo, diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index 5ddd103f..2936664b 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -3,6 +3,7 @@ package servers import ( "encoding/json" "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" + "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" @@ -86,12 +87,14 @@ func (this *IndexAction) RunGet(params struct { // 服务列表 serversResp, err := this.RPC().ServerRPC().ListEnabledServersMatch(this.AdminContext(), &pb.ListEnabledServersMatchRequest{ - Offset: page.Offset, - Size: page.Size, - NodeClusterId: params.ClusterId, - ServerGroupId: params.GroupId, - Keyword: params.Keyword, - AuditingFlag: params.AuditingFlag, + Offset: page.Offset, + Size: page.Size, + NodeClusterId: params.ClusterId, + ServerGroupId: params.GroupId, + Keyword: params.Keyword, + AuditingFlag: params.AuditingFlag, + TrafficOutDesc: params.TrafficOutOrder == "desc", + TrafficOutAsc: params.TrafficOutOrder == "asc", }) if err != nil { this.ErrorPage(err) @@ -208,6 +211,15 @@ func (this *IndexAction) RunGet(params struct { auditingTime = timeutil.FormatTime("Y-m-d", server.AuditingAt) } + // 统计数据 + var bandwidth = "" + if server.LatestServerDailyStat != nil { + var bytesPerSecond = server.LatestServerDailyStat.Bytes / 300 + if bytesPerSecond > 0 { + bandwidth = numberutils.FormatBytes(bytesPerSecond) + } + } + serverMaps = append(serverMaps, maps.Map{ "id": server.Id, "isOn": server.IsOn, @@ -225,6 +237,7 @@ func (this *IndexAction) RunGet(params struct { "auditingIsOk": auditingIsOk, "user": userMap, "auditingTime": auditingTime, + "bandwidth": bandwidth, }) } this.Data["servers"] = serverMaps diff --git a/web/views/@default/clusters/cluster/nodes.html b/web/views/@default/clusters/cluster/nodes.html index 7fc4a8b9..9ecb2dde 100644 --- a/web/views/@default/clusters/cluster/nodes.html +++ b/web/views/@default/clusters/cluster/nodes.html @@ -66,7 +66,7 @@
{{addrError}}源站服务器地址,通常是一个IP(或域名)加端口,不需要加 http:// 或 https://。
diff --git a/web/views/@default/servers/create.html b/web/views/@default/servers/create.html index da64b886..670b71e7 100644 --- a/web/views/@default/servers/create.html +++ b/web/views/@default/servers/create.html @@ -9,12 +9,14 @@可以是网站用途或者域名等。
当前服务所属平台用户。
绑定后,才能通过域名可以访问不同的服务。
@@ -99,7 +101,7 @@{{addrError}}源站服务器地址,通常是一个IP(或域名)加端口,不需要加 http:// 或 https://。