From 5c6bfe50f49c7f5f816344c2daf13aaac9bad54e Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Thu, 6 Apr 2023 10:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=BA=A7=E5=88=AB=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/actions/default/log/exportExcel.go    | 14 ++++++++++
 internal/web/actions/default/log/index.go     | 26 ++++++++++++++++---
 web/views/@default/log/@menu.html             |  1 +
 web/views/@default/log/index.html             |  8 +++++-
 web/views/@default/log/index.js               |  2 +-
 5 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/internal/web/actions/default/log/exportExcel.go b/internal/web/actions/default/log/exportExcel.go
index e97454f8..9a1b3c70 100644
--- a/internal/web/actions/default/log/exportExcel.go
+++ b/internal/web/actions/default/log/exportExcel.go
@@ -23,6 +23,7 @@ func (this *ExportExcelAction) RunGet(params struct {
 	DayTo    string
 	Keyword  string
 	UserType string
+	Level    string
 }) {
 	logsResp, err := this.RPC().LogRPC().ListLogs(this.AdminContext(), &pb.ListLogsRequest{
 		Offset:   0,
@@ -31,6 +32,7 @@ func (this *ExportExcelAction) RunGet(params struct {
 		DayTo:    params.DayTo,
 		Keyword:  params.Keyword,
 		UserType: params.UserType,
+		Level:    params.Level,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -56,6 +58,7 @@ func (this *ExportExcelAction) RunGet(params struct {
 		row.AddCell().SetString("区域")
 		row.AddCell().SetString("运营商")
 		row.AddCell().SetString("页面地址")
+		row.AddCell().SetString("级别")
 	}
 
 	// 数据
@@ -95,6 +98,17 @@ func (this *ExportExcelAction) RunGet(params struct {
 		row.AddCell().SetString(regionName)
 		row.AddCell().SetString(ispName)
 		row.AddCell().SetString(log.Action)
+
+		var levelName = ""
+		switch log.Level {
+		case "info":
+			levelName = "信息"
+		case "warn", "warning":
+			levelName = "警告"
+		case "error":
+			levelName = "错误"
+		}
+		row.AddCell().SetString(levelName)
 	}
 
 	this.AddHeader("Content-Type", "application/vnd.ms-excel")
diff --git a/internal/web/actions/default/log/index.go b/internal/web/actions/default/log/index.go
index 6a61dc38..247f7536 100644
--- a/internal/web/actions/default/log/index.go
+++ b/internal/web/actions/default/log/index.go
@@ -21,6 +21,7 @@ func (this *IndexAction) RunGet(params struct {
 	DayTo    string
 	Keyword  string
 	UserType string
+	Level    string
 }) {
 	// 读取配置
 	config, err := configloaders.LoadLogConfig()
@@ -35,18 +36,36 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["keyword"] = params.Keyword
 	this.Data["userType"] = params.UserType
 
+	// 级别
+	this.Data["level"] = params.Level
+	this.Data["levelOptions"] = []maps.Map{
+		{
+			"code": "info",
+			"name": "信息",
+		},
+		{
+			"code": "warn",
+			"name": "警告",
+		},
+		{
+			"code": "error",
+			"name": "错误",
+		},
+	}
+
 	countResp, err := this.RPC().LogRPC().CountLogs(this.AdminContext(), &pb.CountLogRequest{
 		DayFrom:  params.DayFrom,
 		DayTo:    params.DayTo,
 		Keyword:  params.Keyword,
 		UserType: params.UserType,
+		Level:    params.Level,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	count := countResp.Count
-	page := this.NewPage(count)
+	var count = countResp.Count
+	var page = this.NewPage(count)
 	this.Data["page"] = page.AsHTML()
 
 	logsResp, err := this.RPC().LogRPC().ListLogs(this.AdminContext(), &pb.ListLogsRequest{
@@ -56,12 +75,13 @@ func (this *IndexAction) RunGet(params struct {
 		DayTo:    params.DayTo,
 		Keyword:  params.Keyword,
 		UserType: params.UserType,
+		Level:    params.Level,
 	})
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	logMaps := []maps.Map{}
+	var logMaps = []maps.Map{}
 	for _, log := range logsResp.Logs {
 		regionName := ""
 		regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: log.Ip})
diff --git a/web/views/@default/log/@menu.html b/web/views/@default/log/@menu.html
index a189e2b6..78bef606 100644
--- a/web/views/@default/log/@menu.html
+++ b/web/views/@default/log/@menu.html
@@ -1,5 +1,6 @@
 <first-menu>
 	<menu-item href="/log" code="list">查询</menu-item>
+    <span class="item disabled">|</span>
 	<menu-item href="/log/clean" code="clean" v-if="logConfig.canClean">清理</menu-item>
 	<menu-item href="/log/settings" code="setting">设置</menu-item>
 </first-menu>
\ No newline at end of file
diff --git a/web/views/@default/log/index.html b/web/views/@default/log/index.html
index e104642f..3a49d5de 100644
--- a/web/views/@default/log/index.html
+++ b/web/views/@default/log/index.html
@@ -15,6 +15,12 @@
 		<div class="ui field">
 			<input type="text" name="keyword" style="width:10em" v-model="keyword" placeholder="关键词"/>
 		</div>
+        <div class="ui field">
+            <select class="ui dropdown" name="level" v-model="level">
+                <option value="">[级别]</option>
+                <option v-for="levelOption in levelOptions" :value="levelOption.code">{{levelOption.name}}</option>
+            </select>
+        </div>
         <div class="ui field">
             <select class="ui dropdown auto-width" name="userType" v-model="userType">
                 <option value="">[用户类型]</option>
@@ -25,7 +31,7 @@
 		<div class="ui field">
 			<button type="submit" class="ui button">查询</button>
 		</div>
-		<div class="ui field" v-if="dayFrom.length > 0 || dayTo.length > 0 || keyword.length > 0">
+		<div class="ui field" v-if="dayFrom.length > 0 || dayTo.length > 0 || keyword.length > 0 || level.length > 0">
 			<a href="/log">[清除条件]</a>
 		</div>
 		<div class="ui field">
diff --git a/web/views/@default/log/index.js b/web/views/@default/log/index.js
index 231912a6..dc8376ed 100644
--- a/web/views/@default/log/index.js
+++ b/web/views/@default/log/index.js
@@ -15,7 +15,7 @@ Tea.context(function () {
 	this.exportExcel = function () {
 		let that = this
 		teaweb.confirm("确定要将当前列表导出到Excel吗？", function () {
-			window.location = "/log/exportExcel?dayFrom=" + that.dayFrom + "&dayTo=" + that.dayTo + "&keyword=" + that.keyword + "&userType=" + that.userType
+			window.location = "/log/exportExcel?dayFrom=" + that.dayFrom + "&dayTo=" + that.dayTo + "&keyword=" + that.keyword + "&userType=" + that.userType + '&level=' + that.level
 		})
 	}