From 0909164a067c18e17d207e64bef8bd49af67d987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Sat, 5 Jun 2021 15:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=9C=8D=E5=8A=A1=E9=9B=86?=
 =?UTF-8?q?=E7=BE=A4=E5=88=9B=E5=BB=BA=E6=97=B6=E5=8F=AF=E4=BB=A5=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=BC=80=E5=90=AF=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/actions/default/ns/clusters/create.go | 28 ++++++++-
 .../web/actions/default/ns/domains/create.go  |  8 +++
 web/views/@default/ns/clusters/create.html    |  4 ++
 web/views/@default/ns/domains/create.html     | 61 +++++++++++--------
 web/views/@default/ns/index.html              |  2 +-
 5 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/internal/web/actions/default/ns/clusters/create.go b/internal/web/actions/default/ns/clusters/create.go
index 9db92d49..ce7e55c3 100644
--- a/internal/web/actions/default/ns/clusters/create.go
+++ b/internal/web/actions/default/ns/clusters/create.go
@@ -3,7 +3,9 @@
 package clusters
 
 import (
+	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 )
@@ -17,24 +19,44 @@ func (this *CreateAction) Init() {
 }
 
 func (this *CreateAction) RunGet(params struct{}) {
+	// 默认的访问日志设置
+	this.Data["accessLogRef"] = &dnsconfigs.AccessLogRef{
+		IsOn: true,
+	}
+
 	this.Show()
 }
 
 func (this *CreateAction) RunPost(params struct {
-	Name string
+	Name          string
+	AccessLogJSON []byte
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
 }) {
 	var clusterId int64
-	defer this.CreateLogInfo("创建域名服务集群 %d", clusterId)
+	defer func() {
+		this.CreateLogInfo("创建域名服务集群 %d", clusterId)
+	}()
 
 	params.Must.
 		Field("name", params.Name).
 		Require("请输入集群名称")
 
+	// 校验访问日志设置
+	ref := &dnsconfigs.AccessLogRef{}
+	err := json.Unmarshal(params.AccessLogJSON, ref)
+	if err != nil {
+		this.Fail("数据格式错误：" + err.Error())
+	}
+	err = ref.Init()
+	if err != nil {
+		this.Fail("数据格式错误：" + err.Error())
+	}
+
 	resp, err := this.RPC().NSClusterRPC().CreateNSCluster(this.AdminContext(), &pb.CreateNSClusterRequest{
-		Name: params.Name,
+		Name:          params.Name,
+		AccessLogJSON: params.AccessLogJSON,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/internal/web/actions/default/ns/domains/create.go b/internal/web/actions/default/ns/domains/create.go
index b0643861..b24b4811 100644
--- a/internal/web/actions/default/ns/domains/create.go
+++ b/internal/web/actions/default/ns/domains/create.go
@@ -19,6 +19,14 @@ func (this *CreateAction) Init() {
 }
 
 func (this *CreateAction) RunGet(params struct{}) {
+	// 集群数量
+	countClustersResp, err := this.RPC().NSClusterRPC().CountAllEnabledNSClusters(this.AdminContext(), &pb.CountAllEnabledNSClustersRequest{})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Data["countClusters"] = countClustersResp.Count
+
 	this.Show()
 }
 
diff --git a/web/views/@default/ns/clusters/create.html b/web/views/@default/ns/clusters/create.html
index b4f4ad54..ebf5b017 100644
--- a/web/views/@default/ns/clusters/create.html
+++ b/web/views/@default/ns/clusters/create.html
@@ -12,5 +12,9 @@
             </td>
         </tr>
     </table>
+
+    <h3>访问日志设置</h3>
+    <ns-access-log-ref-box :v-access-log-ref="accessLogRef"></ns-access-log-ref-box>
+
     <submit-btn></submit-btn>
 </form>
\ No newline at end of file
diff --git a/web/views/@default/ns/domains/create.html b/web/views/@default/ns/domains/create.html
index 9755e88d..f12942f4 100644
--- a/web/views/@default/ns/domains/create.html
+++ b/web/views/@default/ns/domains/create.html
@@ -1,29 +1,38 @@
 {$layout}
 {$template "../menu"}
 
-<form class="ui form" data-tea-action="$" data-tea-success="success">
-    <csrf-token></csrf-token>
-    <table class="ui table definition selectable">
-        <tr>
-            <td>域名 *</td>
-            <td>
-                <input type="text" name="name" maxlength="255" ref="focus"/>
-            </td>
-        </tr>
-        <tr>
-            <td class="title">所属集群 *</td>
-            <td>
-                <ns-cluster-selector></ns-cluster-selector>
-                <p class="comment">需要部署域名服务的集群。</p>
-            </td>
-        </tr>
-        <tr>
-            <td>所属用户</td>
-            <td>
-                <ns-user-selector></ns-user-selector>
-                <p class="comment">当前域名所属的平台用户。</p>
-            </td>
-        </tr>
-    </table>
-    <submit-btn></submit-btn>
-</form>
\ No newline at end of file
+
+<div v-if="countClusters == 0">
+    <not-found-box>
+        暂时还没有集群，请先 <a href="/ns/clusters/create">创建集群</a>。
+    </not-found-box>
+</div>
+
+<div v-show="countClusters > 0">
+    <form class="ui form" data-tea-action="$" data-tea-success="success">
+        <csrf-token></csrf-token>
+        <table class="ui table definition selectable">
+            <tr>
+                <td>域名 *</td>
+                <td>
+                    <input type="text" name="name" maxlength="255" ref="focus"/>
+                </td>
+            </tr>
+            <tr>
+                <td class="title">所属集群 *</td>
+                <td>
+                    <ns-cluster-selector></ns-cluster-selector>
+                    <p class="comment">需要部署域名服务的集群。</p>
+                </td>
+            </tr>
+            <tr>
+                <td>所属用户</td>
+                <td>
+                    <ns-user-selector></ns-user-selector>
+                    <p class="comment">当前域名所属的平台用户。</p>
+                </td>
+            </tr>
+        </table>
+        <submit-btn></submit-btn>
+    </form>
+</div>
\ No newline at end of file
diff --git a/web/views/@default/ns/index.html b/web/views/@default/ns/index.html
index 4f3bd6e7..e0d33ac4 100644
--- a/web/views/@default/ns/index.html
+++ b/web/views/@default/ns/index.html
@@ -3,7 +3,7 @@
 
 <div v-if="countClusters == 0">
     <not-found-box>
-        暂时还没有集群，请先 <a href="/ns/clusters">创建集群</a>。
+        暂时还没有集群，请先 <a href="/ns/clusters/create">创建集群</a>。
     </not-found-box>
 </div>