节点IP增加是否启用、是否在线状态

internal/web/actions/default/nodes/ipAddresses/createPopup.go

@@ -42,6 +42,8 @@ func (this *CreatePopupAction) RunPost(params struct {
 		"canAccess": params.CanAccess,
 		"ip":        params.IP,
 		"id":        0,
+		"isOn":      true,
+		"isUp":      true,
 	}
 	this.Success()
 }

internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go

@@ -18,11 +18,18 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
 	for _, addr := range addresses {
 		addrId := addr.GetInt64("id")
 		if addrId > 0 {
+			var isOn = false
+			if !addr.Has("isOn") { // 兼容老版本
+				isOn = true
+			} else {
+				isOn = addr.GetBool("isOn")
+			}
 			_, err = parentAction.RPC().NodeIPAddressRPC().UpdateNodeIPAddress(parentAction.AdminContext(), &pb.UpdateNodeIPAddressRequest{
 				AddressId: addrId,
 				Ip:        addr.GetString("ip"),
 				Name:      addr.GetString("name"),
 				CanAccess: addr.GetBool("canAccess"),
+				IsOn:      isOn,
 			})
 			if err != nil {
 				return err

internal/web/actions/default/nodes/ipAddresses/updatePopup.go

@@ -2,6 +2,7 @@ package ipAddresses
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"net"
@@ -26,15 +27,25 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	IP        string `alias:"ip"`
 	Name      string
 	CanAccess bool
+	IsOn      bool
 
 	Must *actions.Must
 }) {
-	// TODO 严格校验IP地址
-
 	params.Must.
 		Field("ip", params.IP).
 		Require("请输入IP地址")
 
+	// 获取IP地址信息
+	addressResp, err := this.RPC().NodeIPAddressRPC().FindEnabledNodeIPAddress(this.AdminContext(), &pb.FindEnabledNodeIPAddressRequest{AddressId: params.AddressId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	var address = addressResp.IpAddress
+	if address == nil {
+		this.Fail("找不到要修改的地址")
+	}
+
 	ip := net.ParseIP(params.IP)
 	if len(ip) == 0 {
 		this.Fail("请输入正确的IP")
@@ -45,6 +56,8 @@ func (this *UpdatePopupAction) RunPost(params struct {
 		"ip":        params.IP,
 		"id":        params.AddressId,
 		"canAccess": params.CanAccess,
+		"isOn":      params.IsOn,
+		"isUp":      address.IsUp,
 	}
 
 	this.Success()