修复服务访问日志不能使用集群、节点筛选的Bug

2025-11-27 05:00:25 +08:00 · 2022-01-20 16:28:43 +08:00
parent 4b4072a47e
commit 460439f6bd
7 changed files with 39 additions and 12 deletions
--- a/internal/web/actions/default/servers/server/log/history.go
+++ b/internal/web/actions/default/servers/server/log/history.go
@@ -29,6 +29,9 @@ func (this *HistoryAction) RunGet(params struct {
 	RequestId string
 	HasError  int

+	ClusterId int64
+	NodeId    int64
+
 	PageSize int
 }) {
 	if len(params.Day) == 0 {
@@ -44,6 +47,8 @@ func (this *HistoryAction) RunGet(params struct {
 	this.Data["hasError"] = params.HasError
 	this.Data["hasWAF"] = params.HasWAF
 	this.Data["pageSize"] = params.PageSize
+	this.Data["clusterId"] = params.ClusterId
+	this.Data["nodeId"] = params.NodeId

 	day := params.Day
 	ipList := []string{}
@@ -66,6 +71,8 @@ func (this *HistoryAction) RunGet(params struct {
 			Keyword:           params.Keyword,
 			Ip:                params.Ip,
 			Domain:            params.Domain,
+			NodeId:            params.NodeId,
+			NodeClusterId:     params.ClusterId,
 			Size:              size,
 		})
 		if err != nil {
@@ -102,6 +109,8 @@ func (this *HistoryAction) RunGet(params struct {
 				Keyword:           params.Keyword,
 				Ip:                params.Ip,
 				Domain:            params.Domain,
+				NodeId:            params.NodeId,
+				NodeClusterId:     params.ClusterId,
 				Size:              size,
 				Reverse:           true,
 			})
--- a/internal/web/actions/default/servers/server/log/index.go
+++ b/internal/web/actions/default/servers/server/log/index.go
@@ -22,6 +22,8 @@ func (this *IndexAction) RunGet(params struct {
 	RequestId string
 	Ip        string
 	Domain    string
+	ClusterId int64
+	NodeId    int64
 	Keyword   string
 }) {
 	this.Data["serverId"] = params.ServerId
@@ -30,6 +32,8 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["domain"] = params.Domain
 	this.Data["keyword"] = params.Keyword
 	this.Data["path"] = this.Request.URL.Path
+	this.Data["clusterId"] = params.ClusterId
+	this.Data["nodeId"] = params.NodeId

 	// 记录最近使用
 	_, err := this.RPC().LatestItemRPC().IncreaseLatestItem(this.AdminContext(), &pb.IncreaseLatestItemRequest{
@@ -50,19 +54,23 @@ func (this *IndexAction) RunPost(params struct {
 	Keyword   string
 	Ip        string
 	Domain    string
+	ClusterId int64
+	NodeId    int64

 	Must *actions.Must
 }) {
 	isReverse := len(params.RequestId) > 0
 	accessLogsResp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
-		ServerId:  params.ServerId,
-		RequestId: params.RequestId,
-		Size:      20,
-		Day:       timeutil.Format("Ymd"),
-		Keyword:   params.Keyword,
-		Ip:        params.Ip,
-		Domain:    params.Domain,
-		Reverse:   isReverse,
+		ServerId:      params.ServerId,
+		RequestId:     params.RequestId,
+		Size:          20,
+		Day:           timeutil.Format("Ymd"),
+		Keyword:       params.Keyword,
+		Ip:            params.Ip,
+		Domain:        params.Domain,
+		NodeId:        params.NodeId,
+		NodeClusterId: params.ClusterId,
+		Reverse:       isReverse,
 	})
 	if err != nil {
 		this.ErrorPage(err)
--- a/internal/web/actions/default/servers/server/log/today.go
+++ b/internal/web/actions/default/servers/server/log/today.go
@@ -24,6 +24,8 @@ func (this *TodayAction) RunGet(params struct {
 	Keyword   string
 	Ip        string
 	Domain    string
+	ClusterId int64
+	NodeId    int64

 	PageSize int
 }) {
@@ -40,6 +42,8 @@ func (this *TodayAction) RunGet(params struct {
 	this.Data["ip"] = params.Ip
 	this.Data["domain"] = params.Domain
 	this.Data["hasWAF"] = params.HasWAF
+	this.Data["clusterId"] = params.ClusterId
+	this.Data["nodeId"] = params.NodeId

 	resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
 		RequestId:         params.RequestId,
@@ -50,6 +54,8 @@ func (this *TodayAction) RunGet(params struct {
 		Keyword:           params.Keyword,
 		Ip:                params.Ip,
 		Domain:            params.Domain,
+		NodeId:            params.NodeId,
+		NodeClusterId:     params.ClusterId,
 		Size:              size,
 	})
 	if err != nil {
@@ -87,6 +93,8 @@ func (this *TodayAction) RunGet(params struct {
 			Keyword:           params.Keyword,
 			Ip:                params.Ip,
 			Domain:            params.Domain,
+			NodeId:            params.NodeId,
+			NodeClusterId:     params.ClusterId,
 			Size:              size,
 			Reverse:           true,
 		})
--- a/web/views/@default/servers/server/log/history.html
+++ b/web/views/@default/servers/server/log/history.html
@@ -14,7 +14,7 @@
        <input type="hidden" name="serverId" :value="serverId"/>
        <input type="hidden" name="hasError" :value="hasError"/>
        <input type="hidden" name="hasWAF" :value="hasWAF"/>
-        <http-access-log-search-box :v-ip="ip" :v-domain="domain" :v-keyword="keyword">
+        <http-access-log-search-box :v-ip="ip" :v-domain="domain" :v-keyword="keyword"  :v-cluster-id="clusterId" :v-node-id="nodeId">
            <div class="ui field">
                <input type="text" name="day" maxlength="10" placeholder="选择日期" style="width:7.8em" id="day-input" v-model="day"/>
            </div>
--- a/web/views/@default/servers/server/log/index.html
+++ b/web/views/@default/servers/server/log/index.html
@@ -4,7 +4,7 @@
 <div class="right-box">
    <form method="get" class="ui form small" :action="path" autocomplete="off">
        <input type="hidden" name="serverId" :value="serverId"/>
-        <http-access-log-search-box :v-ip="ip" :v-domain="domain" :v-keyword="keyword"></http-access-log-search-box>
+        <http-access-log-search-box :v-ip="ip" :v-domain="domain" :v-keyword="keyword"  :v-cluster-id="clusterId" :v-node-id="nodeId"></http-access-log-search-box>
    </form>

 	<p class="comment" v-if="isLoaded && accessLogs.length == 0">今天暂时还没有访问日志。</p>
--- a/web/views/@default/servers/server/log/index.js
+++ b/web/views/@default/servers/server/log/index.js
@@ -14,7 +14,9 @@ Tea.context(function () {
 				requestId: this.requestId,
 				keyword: this.keyword,
 				ip: this.ip,
-				domain: this.domain
+				domain: this.domain,
+				clusterId: this.clusterId,
+				nodeId: this.nodeId
 			})
 			.success(function (resp) {
 				this.accessLogs = resp.data.accessLogs.concat(this.accessLogs)
--- a/web/views/@default/servers/server/log/today.html
+++ b/web/views/@default/servers/server/log/today.html
@@ -12,7 +12,7 @@
        <input type="hidden" name="serverId" :value="serverId"/>
        <input type="hidden" name="hasError" :value="hasError"/>
        <input type="hidden" name="hasWAF" :value="hasWAF"/>
-        <http-access-log-search-box :v-ip="ip" :v-domain="domain" :v-keyword="keyword"></http-access-log-search-box>
+        <http-access-log-search-box :v-ip="ip" :v-domain="domain" :v-keyword="keyword" :v-cluster-id="clusterId" :v-node-id="nodeId"></http-access-log-search-box>
    </form>

 	<p class="comment" v-if="accessLogs.length == 0">今天暂时还没有访问日志。</p>