mirror of
				https://github.com/TeaOSLab/EdgeAdmin.git
				synced 2025-11-04 05:00:25 +08:00 
			
		
		
		
	节点运行日志中显示相关服务链接
This commit is contained in:
		@@ -69,6 +69,20 @@ func (this *LogsAction) RunGet(params struct {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	logs := []maps.Map{}
 | 
						logs := []maps.Map{}
 | 
				
			||||||
	for _, log := range logsResp.NodeLogs {
 | 
						for _, log := range logsResp.NodeLogs {
 | 
				
			||||||
 | 
							// 服务信息
 | 
				
			||||||
 | 
							var serverMap = maps.Map{"id": 0}
 | 
				
			||||||
 | 
							if log.ServerId > 0 {
 | 
				
			||||||
 | 
								serverResp, err := this.RPC().ServerRPC().FindEnabledUserServerBasic(this.AdminContext(), &pb.FindEnabledUserServerBasicRequest{ServerId: log.ServerId})
 | 
				
			||||||
 | 
								if err != nil {
 | 
				
			||||||
 | 
									this.ErrorPage(err)
 | 
				
			||||||
 | 
									return
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
								var server = serverResp.Server
 | 
				
			||||||
 | 
								if server != nil {
 | 
				
			||||||
 | 
									serverMap = maps.Map{"id": server.Id, "name": server.Name}
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		logs = append(logs, maps.Map{
 | 
							logs = append(logs, maps.Map{
 | 
				
			||||||
			"tag":         log.Tag,
 | 
								"tag":         log.Tag,
 | 
				
			||||||
			"description": log.Description,
 | 
								"description": log.Description,
 | 
				
			||||||
@@ -76,6 +90,7 @@ func (this *LogsAction) RunGet(params struct {
 | 
				
			|||||||
			"level":       log.Level,
 | 
								"level":       log.Level,
 | 
				
			||||||
			"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
 | 
								"isToday":     timeutil.FormatTime("Y-m-d", log.CreatedAt) == timeutil.Format("Y-m-d"),
 | 
				
			||||||
			"count":       log.Count,
 | 
								"count":       log.Count,
 | 
				
			||||||
 | 
								"server":      serverMap,
 | 
				
			||||||
		})
 | 
							})
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	this.Data["logs"] = logs
 | 
						this.Data["logs"] = logs
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -90,6 +90,20 @@ func (this *IndexAction) RunGet(params struct {
 | 
				
			|||||||
			continue
 | 
								continue
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// 服务信息
 | 
				
			||||||
 | 
							var serverMap = maps.Map{"id": 0}
 | 
				
			||||||
 | 
							if log.ServerId > 0 {
 | 
				
			||||||
 | 
								serverResp, err := this.RPC().ServerRPC().FindEnabledUserServerBasic(this.AdminContext(), &pb.FindEnabledUserServerBasicRequest{ServerId: log.ServerId})
 | 
				
			||||||
 | 
								if err != nil {
 | 
				
			||||||
 | 
									this.ErrorPage(err)
 | 
				
			||||||
 | 
									return
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
								var server = serverResp.Server
 | 
				
			||||||
 | 
								if server != nil {
 | 
				
			||||||
 | 
									serverMap = maps.Map{"id": server.Id, "name": server.Name}
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		logs = append(logs, maps.Map{
 | 
							logs = append(logs, maps.Map{
 | 
				
			||||||
			"id":          log.Id,
 | 
								"id":          log.Id,
 | 
				
			||||||
			"tag":         log.Tag,
 | 
								"tag":         log.Tag,
 | 
				
			||||||
@@ -107,6 +121,7 @@ func (this *IndexAction) RunGet(params struct {
 | 
				
			|||||||
				},
 | 
									},
 | 
				
			||||||
				"name": node.Name,
 | 
									"name": node.Name,
 | 
				
			||||||
			},
 | 
								},
 | 
				
			||||||
 | 
								"server": serverMap,
 | 
				
			||||||
		})
 | 
							})
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	this.Data["logs"] = logs
 | 
						this.Data["logs"] = logs
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,6 +7,6 @@ Vue.component("node-log-row", {
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	template: `<div>
 | 
						template: `<div>
 | 
				
			||||||
	<pre class="log-box" style="margin: 0; padding: 0"><span :class="{red:log.level == 'error', orange:log.level == 'warning', green: log.level == 'success'}"><span v-if="!log.isToday">[{{log.createdTime}}]</span><strong v-if="log.isToday">[{{log.createdTime}}]</strong><keyword :v-word="keyword">[{{log.tag}}]{{log.description}}</keyword></span>   <span v-if="log.count > 1" class="ui label tiny" :class="{red:log.level == 'error', orange:log.level == 'warning'}">共{{log.count}}条</span></pre>
 | 
						<pre class="log-box" style="margin: 0; padding: 0"><span :class="{red:log.level == 'error', orange:log.level == 'warning', green: log.level == 'success'}"><span v-if="!log.isToday">[{{log.createdTime}}]</span><strong v-if="log.isToday">[{{log.createdTime}}]</strong><keyword :v-word="keyword">[{{log.tag}}]{{log.description}}</keyword></span>   <span v-if="log.count > 1" class="ui label tiny" :class="{red:log.level == 'error', orange:log.level == 'warning'}">共{{log.count}}条</span> <span v-if="log.server != null && log.server.id > 0"><a :href="'/servers/server?serverId=' + log.server.id" class="ui label tiny basic">{{log.server.name}}</a></span></pre>
 | 
				
			||||||
</div>`
 | 
					</div>`
 | 
				
			||||||
})
 | 
					})
 | 
				
			||||||
		Reference in New Issue
	
	Block a user