mirror of
				https://github.com/TeaOSLab/EdgeAdmin.git
				synced 2025-11-04 05:00:25 +08:00 
			
		
		
		
	节点IP显示原始IP(如果已经切换到备用IP的话)
This commit is contained in:
		@@ -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,
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user