优化界面

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,13 +146,6 @@ func (this *CreateNodeAction) RunPost(params struct {
 	nodeId := createResp.NodeId
 
 	// IP地址
-	ipAddresses := []maps.Map{}
-	if len(params.IpAddressesJSON) > 0 {
-		err = json.Unmarshal(params.IpAddressesJSON, &ipAddresses)
-		if err != nil {
-			this.ErrorPage(err)
-			return
-		}
 	for _, address := range ipAddresses {
 		addressId := address.GetInt64("id")
 		if addressId > 0 {
@@ -160,7 +166,6 @@ func (this *CreateNodeAction) RunPost(params struct {
 			return
 		}
 	}
-	}
 
 	// 创建日志
 	defer this.CreateLog(oplogs.LevelInfo, "创建节点 %d", nodeId)

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

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)

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
 	}
 
 	// 分组

web/public/js/components/server/http-cache-config-box.js

@@ -89,7 +89,7 @@ Vue.component("http-cache-config-box", {
 			<tr>
 				<td>缓存策略</td>
 				<td>
-					<div v-if="vCachePolicy != null">{{vCachePolicy.name}}
+					<div v-if="vCachePolicy != null">{{vCachePolicy.name}} <link-icon :href="'/servers/components/cache/policy?cachePolicyId=' + vCachePolicy.id"></link-icon>
 						<p class="comment">使用当前服务所在集群的设置。</p>
 					</div>
 					<span v-else class="red">当前集群没有设置缓存策略，当前配置无法生效。</span>

web/public/js/components/server/http-firewall-config-box.js

@@ -22,7 +22,7 @@ Vue.component("http-firewall-config-box", {
 			<tr>
 				<td>WAF策略</td>
 				<td>
-					<div v-if="vFirewallPolicy != null">{{vFirewallPolicy.name}}
+					<div v-if="vFirewallPolicy != null">{{vFirewallPolicy.name}} <link-icon :href="'/servers/components/waf/policy?firewallPolicyId=' + vFirewallPolicy.id"></link-icon>
 						<p class="comment">使用当前服务所在集群的设置。</p>
 					</div>
 					<span v-else class="red">当前集群没有设置WAF策略，当前配置无法生效。</span>

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;
 }

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;
 }

web/views/@default/clusters/cluster/createBatch.html

@@ -18,12 +18,14 @@
                 <td>所属区域</td>
                 <td>
                     <node-region-selector></node-region-selector>
+                    <p class="comment">设置区域后才能根据区域进行流量统计和计费。</p>
                 </td>
             </tr>
 			<tr>
 				<td>所属分组</td>
 				<td>
 					<node-group-selector :v-cluster-id="clusterId"></node-group-selector>
+                    <p class="comment">仅用来筛选服务。</p>
 				</td>
 			</tr>
 		</table>

web/views/@default/clusters/cluster/createNode.html

@@ -13,7 +13,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>IP地址</td>
+				<td>IP地址 *</td>
 				<td>
 					<node-ip-addresses-box></node-ip-addresses-box>
 					<p class="comment">用于访问节点和域名解析等。</p>
@@ -31,12 +31,14 @@
                 <td>所属区域</td>
                 <td>
                     <node-region-selector></node-region-selector>
+                    <p class="comment">设置区域后才能根据区域进行流量统计和计费。</p>
                 </td>
             </tr>
 			<tr>
 				<td>所属分组</td>
 				<td>
 					<node-group-selector :v-cluster-id="clusterId"></node-group-selector>
+                    <p class="comment">仅用来筛选服务。</p>
 				</td>
 			</tr>
 			<tr>

web/views/@default/clusters/cluster/node/node.html

@@ -35,6 +35,12 @@
 				<span class="ui label tiny basic" v-for="route in dnsRoutes">{{route.name}}</span>
 			</td>
 		</tr>
+        <tr v-if="dnsRecordName.length > 0 && dnsRecordValue.length > 0">
+            <td>DNS记录</td>
+            <td>{{dnsRecordName}} -&gt; {{dnsRecordValue}}
+                <p class="comment">通过设置A记录可以将集群上的服务请求转发到不同线路的节点上。</p>
+            </td>
+        </tr>
         <tr>
             <td>所属区域</td>
             <td>

web/views/@default/clusters/cluster/node/update.html

@@ -14,7 +14,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>IP地址</td>
+				<td>IP地址 *</td>
 				<td>
 					<node-ip-addresses-box :v-ip-addresses="ipAddresses"></node-ip-addresses-box>
 					<p class="comment">用于访问节点和域名解析等。</p>
@@ -39,12 +39,14 @@
                 <td>所属区域</td>
                 <td>
                     <node-region-selector :v-region="node.region"></node-region-selector>
+                    <p class="comment">设置区域后才能根据区域进行流量统计和计费。</p>
                 </td>
             </tr>
 			<tr>
 				<td>所属分组</td>
 				<td>
 					<node-group-selector :v-cluster-id="clusterId" :v-group="node.group"></node-group-selector>
+                    <p class="comment">仅用来筛选服务。</p>
 				</td>
 			</tr>
 			<tr>

web/views/@default/servers/server/settings/index.html

@@ -6,6 +6,13 @@
 	<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
 		<input type="hidden" name="serverId" :value="server.id"/>
 		<table class="ui table selectable definition">
+            <tr>
+                <td>所属用户</td>
+                <td>
+                    <span v-if="user != null">{{user.fullname}} <span class="small">（{{user.username}}）</span><link-icon :href="'/users/user?userId=' + user.id"></link-icon></span>
+                    <span v-else class="disabled">-</span>
+                </td>
+            </tr>
 			<tr>
 				<td class="title">服务名称 *</td>
 				<td>
@@ -15,7 +22,10 @@
 			<tr>
 				<td>部署的集群 *</td>
 				<td>
-					<select class="ui dropdown auto-width" name="clusterId" v-model="server.clusterId">
+                    <div v-if="user != null">{{clusterName}}
+                        <p class="comment">此选项跟随用户设置，不能单独修改。</p>
+                    </div>
+					<select class="ui dropdown auto-width" name="clusterId" v-model="server.clusterId" v-show="user == null">
 						<option v-for="cluster in clusters" :value="cluster.id">{{cluster.name}}</option>
 					</select>
 				</td>

web/views/@default/users/update.html

@@ -42,7 +42,7 @@
             <td>关联集群 *</td>
             <td>
                 <cluster-selector :v-cluster-id="clusterId"></cluster-selector>
-                <p class="comment">用户发布的网站服务会自动部署到此集群。</p>
+                <p class="comment">用户发布的网站服务会自动部署到此集群，修改此选项会同步修改当前用户下的所有服务。</p>
             </td>
         </tr>
         <tr>