diff --git a/internal/web/actions/default/servers/server/log/history.go b/internal/web/actions/default/servers/server/log/history.go index 8b4635f3..2b56f4d8 100644 --- a/internal/web/actions/default/servers/server/log/history.go +++ b/internal/web/actions/default/servers/server/log/history.go @@ -53,6 +53,7 @@ func (this *HistoryAction) RunGet(params struct { this.Data["pageSize"] = params.PageSize this.Data["clusterId"] = params.ClusterId this.Data["nodeId"] = params.NodeId + this.Data["partition"] = params.Partition day := params.Day ipList := []string{} diff --git a/internal/web/actions/default/servers/server/log/today.go b/internal/web/actions/default/servers/server/log/today.go index 4938f616..97a5698b 100644 --- a/internal/web/actions/default/servers/server/log/today.go +++ b/internal/web/actions/default/servers/server/log/today.go @@ -46,6 +46,8 @@ func (this *TodayAction) RunGet(params struct { this.Data["hasWAF"] = params.HasWAF this.Data["clusterId"] = params.ClusterId this.Data["nodeId"] = params.NodeId + this.Data["partition"] = params.Partition + this.Data["day"] = timeutil.Format("Ymd") resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{ Partition: params.Partition, diff --git a/web/public/js/components/server/http-access-log-partitions-box.js b/web/public/js/components/server/http-access-log-partitions-box.js index 77b9cebb..8c84a78d 100644 --- a/web/public/js/components/server/http-access-log-partitions-box.js +++ b/web/public/js/components/server/http-access-log-partitions-box.js @@ -31,10 +31,10 @@ Vue.component("http-access-log-partitions-box", { methods: { url: function (p) { let u = window.location.toString() - u = u.replace(/\?partition=\d+/, "?") - u = u.replace(/\?requestId=\d+/, "?") - u = u.replace(/&partition=\d+/, "") - u = u.replace(/&requestId=\d+/, "") + u = u.replace(/\?partition=-?\d+/, "?") + u = u.replace(/\?requestId=-?\d+/, "?") + u = u.replace(/&partition=-?\d+/, "") + u = u.replace(/&requestId=-?\d+/, "") if (u.indexOf("?") > 0) { u += "&partition=" + p } else { @@ -53,7 +53,7 @@ Vue.component("http-access-log-partitions-box", { template: `
` diff --git a/web/views/@default/servers/server/log/history.html b/web/views/@default/servers/server/log/history.html index 56986e98..2fc7cd4a 100644 --- a/web/views/@default/servers/server/log/history.html +++ b/web/views/@default/servers/server/log/history.html @@ -37,6 +37,9 @@ + + +

暂时还没有访问日志。

@@ -47,10 +50,10 @@
- 上一页 + 上一页 上一页   |   - 下一页 + 下一页 下一页
diff --git a/web/views/@default/servers/server/log/today.html b/web/views/@default/servers/server/log/today.html index 53435250..512eecc2 100644 --- a/web/views/@default/servers/server/log/today.html +++ b/web/views/@default/servers/server/log/today.html @@ -25,6 +25,9 @@ + + +

今天暂时还没有访问日志。

@@ -35,10 +38,10 @@
- 上一页 + 上一页 上一页   |   - 下一页 + 下一页 下一页