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", { 缓存策略 -
{{vCachePolicy.name}} +
{{vCachePolicy.name}}

使用当前服务所在集群的设置。

当前集群没有设置缓存策略,当前配置无法生效。 diff --git a/web/public/js/components/server/http-firewall-config-box.js b/web/public/js/components/server/http-firewall-config-box.js index 3a3f7604..9bfc17f7 100644 --- a/web/public/js/components/server/http-firewall-config-box.js +++ b/web/public/js/components/server/http-firewall-config-box.js @@ -22,7 +22,7 @@ Vue.component("http-firewall-config-box", { WAF策略 -
{{vFirewallPolicy.name}} +
{{vFirewallPolicy.name}}

使用当前服务所在集群的设置。

当前集群没有设置WAF策略,当前配置无法生效。 diff --git a/web/views/@default/@layout.css b/web/views/@default/@layout.css index d4bd3582..dcfbe391 100644 --- a/web/views/@default/@layout.css +++ b/web/views/@default/@layout.css @@ -137,7 +137,7 @@ tbody { } p.comment, div.comment { - color: rgba(0, 0, 0, 0.3); + color: rgba(0, 0, 0, 0.5); padding-top: 0.4em; font-size: 1em; } diff --git a/web/views/@default/@layout.less b/web/views/@default/@layout.less index d80b7032..fd40fc4d 100644 --- a/web/views/@default/@layout.less +++ b/web/views/@default/@layout.less @@ -66,7 +66,7 @@ tbody { } p.comment, div.comment { - color: rgba(0, 0, 0, 0.3); + color: rgba(0, 0, 0, 0.5); padding-top: 0.4em; font-size: 1em; } diff --git a/web/views/@default/clusters/cluster/createBatch.html b/web/views/@default/clusters/cluster/createBatch.html index a4fea875..941c7fe2 100644 --- a/web/views/@default/clusters/cluster/createBatch.html +++ b/web/views/@default/clusters/cluster/createBatch.html @@ -18,12 +18,14 @@ 所属区域 +

设置区域后才能根据区域进行流量统计和计费。

所属分组 +

仅用来筛选服务。

diff --git a/web/views/@default/clusters/cluster/createNode.html b/web/views/@default/clusters/cluster/createNode.html index 5b173daf..0ef1c41d 100644 --- a/web/views/@default/clusters/cluster/createNode.html +++ b/web/views/@default/clusters/cluster/createNode.html @@ -13,7 +13,7 @@ - IP地址 + IP地址 *

用于访问节点和域名解析等。

@@ -31,12 +31,14 @@ 所属区域 +

设置区域后才能根据区域进行流量统计和计费。

所属分组 +

仅用来筛选服务。

diff --git a/web/views/@default/clusters/cluster/node/node.html b/web/views/@default/clusters/cluster/node/node.html index 070be23b..28ed427e 100644 --- a/web/views/@default/clusters/cluster/node/node.html +++ b/web/views/@default/clusters/cluster/node/node.html @@ -35,6 +35,12 @@ {{route.name}} + + DNS记录 + {{dnsRecordName}} -> {{dnsRecordValue}} +

通过设置A记录可以将集群上的服务请求转发到不同线路的节点上。

+ + 所属区域 diff --git a/web/views/@default/clusters/cluster/node/update.html b/web/views/@default/clusters/cluster/node/update.html index 60c3b4c0..5d0f8e7b 100644 --- a/web/views/@default/clusters/cluster/node/update.html +++ b/web/views/@default/clusters/cluster/node/update.html @@ -14,7 +14,7 @@ - IP地址 + IP地址 *

用于访问节点和域名解析等。

@@ -39,12 +39,14 @@ 所属区域 +

设置区域后才能根据区域进行流量统计和计费。

所属分组 +

仅用来筛选服务。

diff --git a/web/views/@default/servers/server/settings/index.html b/web/views/@default/servers/server/settings/index.html index 821d103d..bd755897 100644 --- a/web/views/@default/servers/server/settings/index.html +++ b/web/views/@default/servers/server/settings/index.html @@ -6,6 +6,13 @@
+ + + + diff --git a/web/views/@default/users/update.html b/web/views/@default/users/update.html index 3225c6f2..5b13a0b3 100644 --- a/web/views/@default/users/update.html +++ b/web/views/@default/users/update.html @@ -42,7 +42,7 @@
所属用户 + {{user.fullname}} ({{user.username}}) + - +
服务名称 * @@ -15,7 +22,10 @@
部署的集群 * - 关联集群 * -

用户发布的网站服务会自动部署到此集群。

+

用户发布的网站服务会自动部署到此集群,修改此选项会同步修改当前用户下的所有服务。