From 2da73788ece729778da831edc2efa595e60df3ce Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 5 May 2024 19:51:17 +0800
Subject: [PATCH] =?UTF-8?q?IP=E5=90=8D=E5=8D=95=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BB=A3=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/servers/iplists/lists.go        | 5 +++--
 .../web/actions/default/servers/server/settings/waf/index.go | 2 +-
 web/views/@default/servers/iplists/index.html                | 4 ++--
 web/views/@default/servers/iplists/lists.html                | 5 +++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/internal/web/actions/default/servers/iplists/lists.go b/internal/web/actions/default/servers/iplists/lists.go
index 4d3c5429..79b683c6 100644
--- a/internal/web/actions/default/servers/iplists/lists.go
+++ b/internal/web/actions/default/servers/iplists/lists.go
@@ -36,8 +36,8 @@ func (this *ListsAction) RunGet(params struct {
 		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()
 
 	listsResp, err := this.RPC().IPListRPC().ListEnabledIPLists(this.AdminContext(), &pb.ListEnabledIPListsRequest{
@@ -65,6 +65,7 @@ func (this *ListsAction) RunGet(params struct {
 			"id":          list.Id,
 			"isOn":        list.IsOn,
 			"name":        list.Name,
+			"code":        list.Code,
 			"description": list.Description,
 			"countItems":  countItems,
 			"type":        list.Type,
diff --git a/internal/web/actions/default/servers/server/settings/waf/index.go b/internal/web/actions/default/servers/server/settings/waf/index.go
index 88ed4d54..cd3d5c6c 100644
--- a/internal/web/actions/default/servers/server/settings/waf/index.go
+++ b/internal/web/actions/default/servers/server/settings/waf/index.go
@@ -49,7 +49,7 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["webId"] = webConfig.Id
 	this.Data["firewallConfig"] = webConfig.FirewallRef
 
-	// 获取当前服务所在集群的WAF设置
+	// 获取当前网站所在集群的WAF设置
 	firewallPolicy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyWithServerId(this.AdminContext(), params.ServerId)
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/web/views/@default/servers/iplists/index.html b/web/views/@default/servers/iplists/index.html
index f0e2bb9a..c137f0e6 100644
--- a/web/views/@default/servers/iplists/index.html
+++ b/web/views/@default/servers/iplists/index.html
@@ -9,7 +9,7 @@
         </div>
         <div class="ui field">
             <select class="ui dropdown auto-width" name="listType" v-model="listType">
-                <option value="">[类型]</option>
+                <option value="">[所有类型]</option>
                 <option value="black">黑名单</option>
                 <option value="white">白名单</option>
                 <option value="grey">灰名单</option>
@@ -17,7 +17,7 @@
         </div>
         <div class="ui field">
            <select class="ui dropdown" name="eventLevel" v-model="eventLevel">
-               <option value="">[级别]</option>
+               <option value="">[所有级别]</option>
                <option v-for="level in eventLevels" :value="level.code">{{level.name}}</option>
            </select>
         </div>
diff --git a/web/views/@default/servers/iplists/lists.html b/web/views/@default/servers/iplists/lists.html
index 11e92f75..b73e31b3 100644
--- a/web/views/@default/servers/iplists/lists.html
+++ b/web/views/@default/servers/iplists/lists.html
@@ -25,6 +25,7 @@
         <tr>
             <th class="one wide center">ID</th>
             <th class="three wide">名称</th>
+            <th class="two wide">代号</th>
             <th class="two wide center">类型</th>
             <th>备注</th>
             <th class="two wide center">IP数量</th>
@@ -37,6 +38,10 @@
             <a :href="'/servers/iplists/list?listId=' + list.id"><keyword :v-word="keyword">{{list.name}}</keyword></a>
             <div v-if="list.isGlobal" style="margin-top: 0.3em"><grey-label>全局</grey-label></div>
         </td>
+        <td>
+            <span v-if="list.code != null && list.code.length > 0">{{list.code}}</span>
+            <span v-else class="disabled">-</span>
+        </td>
         <td class="center">
             <span v-if="list.type == 'black'"><span class="red">黑名单</span></span>
             <span v-if="list.type == 'white'"><span class="green">白名单</span></span>