TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-20 16:20:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

单个节点支持多个DNS线路

Browse Source
This commit is contained in:
刘祥超
2020-11-16 13:03:45 +08:00
parent 8abf806ce9
commit b466868da1
43 changed files with 348 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/web/actions/default/dns/issues/updateNodePopup.go
View File

@@ -1,8 +1,10 @@
package issues
import (
"encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/actions"
"github.com/iwind/TeaGo/maps"
@@ -33,12 +35,12 @@ func (this *UpdateNodePopupAction) RunGet(params struct {
return
}
this.Data["ipAddr"] = dnsInfo.IpAddr
this.Data["route"] = dnsInfo.Route.Code
this.Data["routes"] = domainutils.ConvertRoutesToMaps(dnsInfo.Routes)
this.Data["domainId"] = dnsInfo.DnsDomainId
this.Data["domainName"] = dnsInfo.DnsDomainName
// 读取所有线路
routeMaps := []maps.Map{}
allRouteMaps := []maps.Map{}
if dnsInfo.DnsDomainId > 0 {
routesResp, err := this.RPC().DNSDomainRPC().FindAllDNSDomainRoutes(this.AdminContext(), &pb.FindAllDNSDomainRoutesRequest{DnsDomainId: dnsInfo.DnsDomainId})
if err != nil {
@@ -47,37 +49,26 @@ func (this *UpdateNodePopupAction) RunGet(params struct {
}
if len(routesResp.Routes) > 0 {
for _, route := range routesResp.Routes {
routeMaps = append(routeMaps, maps.Map{
allRouteMaps = append(allRouteMaps, maps.Map{
"name": route.Name,
"code": route.Code,
})
}
}
}
this.Data["routes"] = routeMaps
// 是否包含现有线路
if len(routeMaps) > 0 {
isRouteValid := false
for _, route := range routeMaps {
if route.GetString("code") == dnsInfo.Route.Code {
isRouteValid = true
break
}
}
if !isRouteValid {
this.Data["route"] = routeMaps[0].GetString("code")
// 筛选
this.Data["routes"] = domainutils.ConvertRoutesToMaps(domainutils.FilterRoutes(dnsInfo.Routes, routesResp.Routes))
}
}
this.Data["allRoutes"] = allRouteMaps
this.Show()
}
func (this *UpdateNodePopupAction) RunPost(params struct {
NodeId int64
IpAddr string
DomainId int64
Route string
NodeId int64
IpAddr string
DomainId int64
DnsRoutesJSON []byte
Must *actions.Must
CSRF *actionutils.CSRF
@@ -85,6 +76,13 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
// 操作日志
this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)
routes := []string{}
err := json.Unmarshal(params.DnsRoutesJSON, &routes)
if err != nil {
this.ErrorPage(err)
return
}
params.Must.
Field("ipAddr", params.IpAddr).
Require("请输入IP地址")
@@ -94,11 +92,11 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
}
// 执行修改
_, err := this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
_, err = this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{
NodeId: params.NodeId,
IpAddr: params.IpAddr,
DnsDomainId: params.DomainId,
Route: params.Route,
Routes: routes,
})
if err != nil {
this.ErrorPage(err)