diff --git a/internal/web/actions/default/clusters/cluster/createNode.go b/internal/web/actions/default/clusters/cluster/createNode.go index 97159e40..c82fbf8e 100644 --- a/internal/web/actions/default/clusters/cluster/createNode.go +++ b/internal/web/actions/default/clusters/cluster/createNode.go @@ -95,6 +95,19 @@ func (this *CreateNodeAction) RunPost(params struct { this.Fail("请选择所在集群") } + // IP地址 + ipAddresses := []maps.Map{} + if len(params.IpAddressesJSON) > 0 { + err := json.Unmarshal(params.IpAddressesJSON, &ipAddresses) + if err != nil { + this.ErrorPage(err) + return + } + } + if len(ipAddresses) == 0 { + this.Fail("请至少输入一个IP地址") + } + dnsRouteCodes := []string{} if len(params.DnsRoutesJSON) > 0 { err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes) @@ -133,33 +146,25 @@ func (this *CreateNodeAction) RunPost(params struct { nodeId := createResp.NodeId // IP地址 - ipAddresses := []maps.Map{} - if len(params.IpAddressesJSON) > 0 { - err = json.Unmarshal(params.IpAddressesJSON, &ipAddresses) + for _, address := range ipAddresses { + addressId := address.GetInt64("id") + if addressId > 0 { + _, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{ + AddressId: addressId, + NodeId: nodeId, + }) + } else { + _, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{ + NodeId: nodeId, + Name: address.GetString("name"), + Ip: address.GetString("ip"), + CanAccess: address.GetBool("canAccess"), + }) + } if err != nil { this.ErrorPage(err) return } - for _, address := range ipAddresses { - addressId := address.GetInt64("id") - if addressId > 0 { - _, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{ - AddressId: addressId, - NodeId: nodeId, - }) - } else { - _, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{ - NodeId: nodeId, - Name: address.GetString("name"), - Ip: address.GetString("ip"), - CanAccess: address.GetBool("canAccess"), - }) - } - if err != nil { - this.ErrorPage(err) - return - } - } } // 创建日志 diff --git a/internal/web/actions/default/clusters/cluster/node/node.go b/internal/web/actions/default/clusters/cluster/node/node.go index f27ec2e2..3f9b87a0 100644 --- a/internal/web/actions/default/clusters/cluster/node/node.go +++ b/internal/web/actions/default/clusters/cluster/node/node.go @@ -77,7 +77,11 @@ func (this *NodeAction) RunGet(params struct { return } dnsRouteMaps := []maps.Map{} + recordName := "" + recordValue := "" if dnsInfoResp.Node != nil { + recordName = dnsInfoResp.Node.NodeClusterDNSName + "." + dnsInfoResp.Node.DnsDomainName + recordValue = dnsInfoResp.Node.IpAddr for _, dnsInfo := range dnsInfoResp.Node.Routes { dnsRouteMaps = append(dnsRouteMaps, maps.Map{ "name": dnsInfo.Name, @@ -86,6 +90,8 @@ func (this *NodeAction) RunGet(params struct { } } this.Data["dnsRoutes"] = dnsRouteMaps + this.Data["dnsRecordName"] = recordName + this.Data["dnsRecordValue"] = recordValue // 登录信息 var loginMap maps.Map = nil diff --git a/internal/web/actions/default/clusters/cluster/node/update.go b/internal/web/actions/default/clusters/cluster/node/update.go index 7dcc75a9..a28f1a1e 100644 --- a/internal/web/actions/default/clusters/cluster/node/update.go +++ b/internal/web/actions/default/clusters/cluster/node/update.go @@ -224,6 +224,19 @@ func (this *UpdateAction) RunPost(params struct { this.Fail("请选择所在集群") } + // IP地址 + ipAddresses := []maps.Map{} + if len(params.IPAddressesJSON) > 0 { + err := json.Unmarshal(params.IPAddressesJSON, &ipAddresses) + if err != nil { + this.ErrorPage(err) + return + } + } + if len(ipAddresses) == 0 { + this.Fail("请至少输入一个IP地址") + } + dnsRouteCodes := []string{} if len(params.DnsRoutesJSON) > 0 { err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes) diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go index 684efc02..d04c8d75 100644 --- a/internal/web/actions/default/servers/server/settings/index.go +++ b/internal/web/actions/default/servers/server/settings/index.go @@ -49,13 +49,27 @@ func (this *IndexAction) RunGet(params struct { } server := serverResp.Server if server == nil { - this.NotFound("Server", params.ServerId) + this.NotFound("server", params.ServerId) return } + // 用户 + if server.User != nil { + this.Data["user"] = maps.Map{ + "id": server.User.Id, + "fullname": server.User.Fullname, + "username": server.User.Username, + } + } else { + this.Data["user"] = nil + } + + // 集群 clusterId := int64(0) + this.Data["clusterName"] = "" if server.NodeCluster != nil { clusterId = server.NodeCluster.Id + this.Data["clusterName"] = server.NodeCluster.Name } // 分组 diff --git a/web/public/js/components/server/http-cache-config-box.js b/web/public/js/components/server/http-cache-config-box.js index da804774..7cf1ef00 100644 --- a/web/public/js/components/server/http-cache-config-box.js +++ b/web/public/js/components/server/http-cache-config-box.js @@ -89,7 +89,7 @@ Vue.component("http-cache-config-box", {
使用当前服务所在集群的设置。
使用当前服务所在集群的设置。
设置区域后才能根据区域进行流量统计和计费。
仅用来筛选服务。
用于访问节点和域名解析等。
@@ -31,12 +31,14 @@设置区域后才能根据区域进行流量统计和计费。
仅用来筛选服务。
通过设置A记录可以将集群上的服务请求转发到不同线路的节点上。
+用于访问节点和域名解析等。
@@ -39,12 +39,14 @@设置区域后才能根据区域进行流量统计和计费。
仅用来筛选服务。