From 22fdd278ed82fee8ba0a5cc372664bd47201f87d Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 5 May 2024 20:20:43 +0800
Subject: [PATCH] =?UTF-8?q?IP=E6=A3=80=E6=9F=A5=E4=B9=9F=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=81=B0=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/actions/default/servers/components/waf/ipadmin/test.go | 1 +
 .../default/servers/groups/group/settings/waf/ipadmin/test.go  | 1 +
 internal/web/actions/default/servers/iplists/test.go           | 3 ++-
 .../default/servers/server/settings/waf/ipadmin/test.go        | 3 ++-
 .../servers/groups/group/settings/waf/ipadmin/test.html        | 3 ++-
 web/views/@default/servers/iplists/test.html                   | 3 ++-
 .../@default/servers/server/settings/waf/ipadmin/test.html     | 3 ++-
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/test.go b/internal/web/actions/default/servers/components/waf/ipadmin/test.go
index 69886456..ceaf49d1 100644
--- a/internal/web/actions/default/servers/components/waf/ipadmin/test.go
+++ b/internal/web/actions/default/servers/components/waf/ipadmin/test.go
@@ -66,6 +66,7 @@ func (this *TestAction) RunPost(params struct {
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(resp.IpItem.EventLevel),
+			"listType":       resp.IpItem.ListType,
 		}
 	}
 
diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/test.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/test.go
index 1b8514a8..d40024ac 100644
--- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/test.go
+++ b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/test.go
@@ -79,6 +79,7 @@ func (this *TestAction) RunPost(params struct {
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(resp.IpItem.EventLevel),
+			"listType":       resp.IpItem.ListType,
 		}
 	}
 
diff --git a/internal/web/actions/default/servers/iplists/test.go b/internal/web/actions/default/servers/iplists/test.go
index 7b06a96e..78756eb0 100644
--- a/internal/web/actions/default/servers/iplists/test.go
+++ b/internal/web/actions/default/servers/iplists/test.go
@@ -47,7 +47,7 @@ func (this *TestAction) RunPost(params struct {
 		return
 	}
 
-	resultMap := maps.Map{
+	var resultMap = maps.Map{
 		"isDone":    true,
 		"isFound":   resp.IsFound,
 		"isOk":      resp.IsOk,
@@ -67,6 +67,7 @@ func (this *TestAction) RunPost(params struct {
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(resp.IpItem.EventLevel),
+			"listType":       resp.IpItem.ListType,
 		}
 	}
 
diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/test.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/test.go
index 1b8514a8..6e426e78 100644
--- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/test.go
+++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/test.go
@@ -53,7 +53,7 @@ func (this *TestAction) RunPost(params struct {
 		return
 	}
 
-	resultMap := maps.Map{
+	var resultMap = maps.Map{
 		"isDone":    true,
 		"isFound":   resp.IsFound,
 		"isOk":      resp.IsOk,
@@ -79,6 +79,7 @@ func (this *TestAction) RunPost(params struct {
 			"expiredTime":    timeutil.FormatTime("Y-m-d H:i:s", resp.IpItem.ExpiredAt),
 			"type":           resp.IpItem.Type,
 			"eventLevelName": firewallconfigs.FindFirewallEventLevelName(resp.IpItem.EventLevel),
+			"listType":       resp.IpItem.ListType,
 		}
 	}
 
diff --git a/web/views/@default/servers/groups/group/settings/waf/ipadmin/test.html b/web/views/@default/servers/groups/group/settings/waf/ipadmin/test.html
index a37bfaee..18fcc606 100644
--- a/web/views/@default/servers/groups/group/settings/waf/ipadmin/test.html
+++ b/web/views/@default/servers/groups/group/settings/waf/ipadmin/test.html
@@ -29,7 +29,8 @@
                         <div v-if="result.isFound">
                             <div v-if="result.item != null">
                                 <div v-if="result.isAllowed">
-                                    <span class="green">在白名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                    <span class="green" v-if="result.item.listType == 'white'">在白名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                    <span class="grey" v-if="result.item.listType == 'grey'">在灰名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
                                 </div>
                                 <div v-else>
                                     <span class="red">在黑名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
diff --git a/web/views/@default/servers/iplists/test.html b/web/views/@default/servers/iplists/test.html
index 82cc5bc0..8d74d3cb 100644
--- a/web/views/@default/servers/iplists/test.html
+++ b/web/views/@default/servers/iplists/test.html
@@ -21,7 +21,8 @@
                     <div v-if="result.isFound">
                         <div v-if="result.item != null">
                             <div v-if="result.isAllowed">
-                                <span class="green">在白名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                <span class="green" v-if="result.item.listType == 'white'">在白名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                <span class="grey"  v-if="result.item.listType == 'grey'">在灰名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
                             </div>
                             <div v-else>
                                 <span class="red">在黑名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/test.html b/web/views/@default/servers/server/settings/waf/ipadmin/test.html
index 99572b00..9407607c 100644
--- a/web/views/@default/servers/server/settings/waf/ipadmin/test.html
+++ b/web/views/@default/servers/server/settings/waf/ipadmin/test.html
@@ -30,7 +30,8 @@
                         <div v-if="result.isFound">
                             <div v-if="result.item != null">
                                 <div v-if="result.isAllowed">
-                                    <span class="green">在白名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                    <span class="green" v-if="result.item.listType == 'white'">在白名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
+                                    <span class="grey" v-if="result.item.listType == 'grey'">在灰名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>
                                 </div>
                                 <div v-else>
                                     <span class="red">在黑名单中 <ip-item-text :v-item="result.item"></ip-item-text>&nbsp;<a href="" @click.prevent="updateItem(result.list.id, result.item.id)" title="查看和修改"><i class="icon pencil small"></i></a></span>