TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2026-03-08 12:25:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复IP地址不能修改在线状态的Bug

Browse Source
This commit is contained in:
刘祥超
2021-09-15 11:46:50 +08:00
parent 713de74abb
commit a885fdbea7
10 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/web/actions/default/clusters/cluster/createBatch.go
View File

@@ -95,6 +95,7 @@ func (this *CreateBatchAction) RunPost(params struct {
Name: "IP地址",
Ip: ip,
CanAccess: true,
IsUp: true,
})
if err != nil {
this.ErrorPage(err)

1
internal/web/actions/default/clusters/cluster/createNode.go
View File

@@ -185,6 +185,7 @@ func (this *CreateNodeAction) RunPost(params struct {
Name: addr.GetString("name"),
Ip: addr.GetString("ip"),
CanAccess: addr.GetBool("canAccess"),
IsUp: addr.GetBool("isUp"),
})
if err != nil {
this.ErrorPage(err)

2
internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go
View File

@@ -31,6 +31,7 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
Name: addr.GetString("name"),
CanAccess: addr.GetBool("canAccess"),
IsOn: isOn,
IsUp: addr.GetBool("isUp"),
})
if err != nil {
return err
@@ -42,6 +43,7 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64,
Name: addr.GetString("name"),
Ip: addr.GetString("ip"),
CanAccess: addr.GetBool("canAccess"),
IsUp: addr.GetBool("isUp"),
})
if err != nil {
return err

1
internal/web/actions/default/nodes/ipAddresses/updatePopup.go
View File

@@ -55,7 +55,6 @@ func (this *UpdatePopupAction) RunPost(params struct {
if address == nil {
this.Fail("找不到要修改的地址")
}
isUp = address.IsUp
}
ip := net.ParseIP(params.IP)

11
internal/web/actions/default/ns/clusters/cluster/createNode.go
View File

@@ -79,8 +79,8 @@ func (this *CreateNodeAction) RunPost(params struct {
nodeId := createResp.NsNodeId
// IP地址
for _, address := range ipAddresses {
addressId := address.GetInt64("id")
for _, addrMap := range ipAddresses {
addressId := addrMap.GetInt64("id")
if addressId > 0 {
_, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{
NodeIPAddressId: addressId,
@@ -90,9 +90,10 @@ func (this *CreateNodeAction) RunPost(params struct {
_, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{
NodeId: nodeId,
Role: nodeconfigs.NodeRoleDNS,
Name: address.GetString("name"),
Ip: address.GetString("ip"),
CanAccess: address.GetBool("canAccess"),
Name: addrMap.GetString("name"),
Ip: addrMap.GetString("ip"),
CanAccess: addrMap.GetBool("canAccess"),
IsUp: addrMap.GetBool("isUp"),
})
}
if err != nil {