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 @@ DNS线路 CPU 内存 - 下行流量 + 下行带宽 负载 状态 操作 diff --git a/web/views/@default/clusters/nodes.html b/web/views/@default/clusters/nodes.html index eef43f57..abf24b6f 100644 --- a/web/views/@default/clusters/nodes.html +++ b/web/views/@default/clusters/nodes.html @@ -60,7 +60,7 @@ DNS线路 CPU 内存 - 下行流量 + 下行带宽 负载 状态 操作 diff --git a/web/views/@default/servers/@menu.html b/web/views/@default/servers/@menu.html index cb1c9002..b6aaaa49 100644 --- a/web/views/@default/servers/@menu.html +++ b/web/views/@default/servers/@menu.html @@ -1,5 +1,6 @@ 服务列表 审核中({{countAuditing}}) - 创建网站服务 + | + [创建网站服务] \ No newline at end of file diff --git a/web/views/@default/servers/addOriginPopup.html b/web/views/@default/servers/addOriginPopup.html index e34ae106..0a178164 100644 --- a/web/views/@default/servers/addOriginPopup.html +++ b/web/views/@default/servers/addOriginPopup.html @@ -26,7 +26,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 @@ 服务名称 * +

可以是网站用途或者域名等。

- 选择用户 + 所属用户 +

当前服务所属平台用户。

@@ -41,7 +43,7 @@ - 绑定域名 + 绑定域名 *

绑定后,才能通过域名可以访问不同的服务。

@@ -99,7 +101,7 @@ - 选择分组 + 选择分组 diff --git a/web/views/@default/servers/index.html b/web/views/@default/servers/index.html index dc1b8f5b..8655383f 100644 --- a/web/views/@default/servers/index.html +++ b/web/views/@default/servers/index.html @@ -32,7 +32,7 @@
  - [清除条件] + [清除条件]
常用 @@ -58,6 +58,7 @@ 部署集群 域名 端口 + 下行带宽 状态 操作 @@ -97,6 +98,10 @@ {{port.portRange}}({{port.protocol}})
+ + {{server.bandwidth}} + - +
diff --git a/web/views/@default/servers/server/settings/origins/updatePopup.html b/web/views/@default/servers/server/settings/origins/updatePopup.html index f3700ca3..36614a64 100644 --- a/web/views/@default/servers/server/settings/origins/updatePopup.html +++ b/web/views/@default/servers/server/settings/origins/updatePopup.html @@ -30,7 +30,7 @@ - 源站地址 + 源站地址 *

{{addrError}}源站服务器地址,通常是一个IP(或域名)加端口,不需要加 http:// 或 https://