From 4fa1234d4d004bd231b964500aa542c6a59f7445 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 26 Oct 2022 10:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=AE=BE=E7=BD=AE=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E2=80=9C=E9=80=9A=E8=BF=87IP=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E2=80=9D=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/clusters/cluster/node/detail.go   |  1 +
 .../default/clusters/cluster/node/update.go   | 19 +++++++++++--------
 .../clusters/cluster/node/detail.html         |  9 ++++++++-
 .../clusters/cluster/node/update.html         |  7 +++++++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/internal/web/actions/default/clusters/cluster/node/detail.go b/internal/web/actions/default/clusters/cluster/node/detail.go
index f85fe305..3eefc956 100644
--- a/internal/web/actions/default/clusters/cluster/node/detail.go
+++ b/internal/web/actions/default/clusters/cluster/node/detail.go
@@ -318,6 +318,7 @@ func (this *DetailAction) RunGet(params struct {
 		"level":             node.Level,
 		"levelInfo":         nodeconfigs.FindNodeLevel(int(node.Level)),
 		"lnAddrs":           lnAddrs,
+		"enableIPLists":     node.EnableIPLists,
 
 		"status": maps.Map{
 			"isActive":             status.IsActive,
diff --git a/internal/web/actions/default/clusters/cluster/node/update.go b/internal/web/actions/default/clusters/cluster/node/update.go
index f1f57e64..b8779ac3 100644
--- a/internal/web/actions/default/clusters/cluster/node/update.go
+++ b/internal/web/actions/default/clusters/cluster/node/update.go
@@ -100,14 +100,15 @@ func (this *UpdateAction) RunGet(params struct {
 	}
 
 	var nodeMap = maps.Map{
-		"id":          node.Id,
-		"name":        node.Name,
-		"ipAddresses": ipAddressMaps,
-		"cluster":     clusterMap,
-		"isOn":        node.IsOn,
-		"group":       groupMap,
-		"region":      regionMap,
-		"level":       node.Level,
+		"id":            node.Id,
+		"name":          node.Name,
+		"ipAddresses":   ipAddressMaps,
+		"cluster":       clusterMap,
+		"isOn":          node.IsOn,
+		"group":         groupMap,
+		"region":        regionMap,
+		"level":         node.Level,
+		"enableIPLists": node.EnableIPLists,
 	}
 
 	if node.LnAddrs == nil {
@@ -157,6 +158,7 @@ func (this *UpdateAction) RunPost(params struct {
 	IsOn                bool
 	Level               int32
 	LnAddrs             []string
+	EnableIPLists       bool
 
 	Must *actions.Must
 }) {
@@ -234,6 +236,7 @@ func (this *UpdateAction) RunPost(params struct {
 		IsOn:                    params.IsOn,
 		Level:                   params.Level,
 		LnAddrs:                 lnAddrs,
+		EnableIPLists:           params.EnableIPLists,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/web/views/@default/clusters/cluster/node/detail.html b/web/views/@default/clusters/cluster/node/detail.html
index 861a37c6..de47be57 100644
--- a/web/views/@default/clusters/cluster/node/detail.html
+++ b/web/views/@default/clusters/cluster/node/detail.html
@@ -8,7 +8,7 @@
 			<td>{{node.name}}</td>
 		</tr>
 		<tr>
-			<td>状态</td>
+			<td>启用状态</td>
 			<td><label-on :v-is-on="node.isOn"></label-on></td>
 		</tr>
         <tr>
@@ -101,6 +101,13 @@
 			<td colspan="2"><more-options-indicator>更多选项</more-options-indicator></td>
 		</tr>
 		<tbody v-show="moreOptionsVisible">
+            <tr>
+                <td>同步IP名单</td>
+                <td>
+                    <span v-if="node.enableIPLists" class="green">Y</span>
+                    <span v-else class="disabled">N</span>
+                </td>
+            </tr>
 			<tr>
 				<td>SSH主机地址</td>
 				<td>
diff --git a/web/views/@default/clusters/cluster/node/update.html b/web/views/@default/clusters/cluster/node/update.html
index 2512c4b4..11b53139 100644
--- a/web/views/@default/clusters/cluster/node/update.html
+++ b/web/views/@default/clusters/cluster/node/update.html
@@ -61,6 +61,13 @@
                         <p class="comment">如果不为空，边缘节点访问当前L2节点时将会使用这些IP地址；如果没有设置，将会使用当前节点已经填写的IP地址。</p>
                     </td>
                 </tr>
+                <tr>
+                    <td>同步IP名单</td>
+                    <td>
+                        <checkbox name="enableIPLists" v-model="node.enableIPLists"></checkbox>
+                        <p class="comment">选中后，表示启用IP名单同步，包括来自管理员、用户添加的IP名单，以及其他节点系统自动拦截的IP名单。</p>
+                    </td>
+                </tr>
                 <tr>
                     <td>启用节点</td>
                     <td>