From d404db7011d7f8b4a7f07e1a26d3216ee48f9350 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Thu, 16 Dec 2021 15:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9IP=E6=98=BE=E7=A4=BA=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8BIP=EF=BC=88=E5=A6=82=E6=9E=9C=E5=B7=B2=E7=BB=8F?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0=E5=A4=87=E7=94=A8IP=E7=9A=84?=
 =?UTF-8?q?=E8=AF=9D=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/clusters/cluster/node/detail.go    |  7 +++++++
 .../default/nodes/ipAddresses/ipaddressutils/utils.go  | 10 ++++++++++
 web/views/@default/clusters/cluster/node/detail.html   |  1 +
 3 files changed, 18 insertions(+)

diff --git a/internal/web/actions/default/clusters/cluster/node/detail.go b/internal/web/actions/default/clusters/cluster/node/detail.go
index c0a7715c..db6ebd24 100644
--- a/internal/web/actions/default/clusters/cluster/node/detail.go
+++ b/internal/web/actions/default/clusters/cluster/node/detail.go
@@ -86,9 +86,16 @@ func (this *DetailAction) RunGet(params struct {
 			return
 		}
 
+		// 是否有备用IP
+		var originIP = addr.Ip
+		if len(addr.BackupIP) > 0 {
+			addr.Ip = addr.BackupIP
+		}
+
 		ipAddressMaps = append(ipAddressMaps, maps.Map{
 			"id":         addr.Id,
 			"name":       addr.Name,
+			"originIP":   originIP,
 			"ip":         addr.Ip,
 			"canAccess":  addr.CanAccess,
 			"isOn":       addr.IsOn,
diff --git a/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go b/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go
index d64c075a..b6f6d9de 100644
--- a/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go
+++ b/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go
@@ -94,6 +94,16 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 					return err
 				}
 			}
+		} else {
+			for _, addrId := range resultAddrIds {
+				_, err = parentAction.RPC().NodeIPAddressThresholdRPC().UpdateAllNodeIPAddressThresholds(parentAction.AdminContext(), &pb.UpdateAllNodeIPAddressThresholdsRequest{
+					NodeIPAddressId:             addrId,
+					NodeIPAddressThresholdsJSON: []byte("[]"),
+				})
+				if err != nil {
+					return err
+				}
+			}
 		}
 	}
 	return nil
diff --git a/web/views/@default/clusters/cluster/node/detail.html b/web/views/@default/clusters/cluster/node/detail.html
index 3afc9f4d..8811c054 100644
--- a/web/views/@default/clusters/cluster/node/detail.html
+++ b/web/views/@default/clusters/cluster/node/detail.html
@@ -24,6 +24,7 @@
 					<div>
 						<div v-for="(address, index) in node.ipAddresses" class="ui label tiny basic">
                             <span v-if="address.ip.indexOf(':') > -1" class="grey">[IPv6]</span> {{address.ip}}
+                            <span class="small red" v-if="address.originIP != null && address.originIP.length > 0 && address.originIP != address.ip">（原：{{address.originIP}}）</span>
 							<span class="small grey" v-if="address.name.length > 0">（{{address.name}}<span v-if="!address.canAccess">，不可访问</span>）</span>
 							<span class="small grey" v-if="address.name.length == 0 && !address.canAccess">（不可访问）</span>
                             <span class="small red" v-if="!address.isOn">[off]</span>