From 3c90c5c72d332de57ad55a631432c3d368b5f854 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 18 Apr 2022 17:18:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=B8=AA=E6=9C=8D=E5=8A=A1=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=9B=86=E7=BE=A4=E6=97=B6=E5=8F=AF=E4=BB=A5=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=98=AF=E5=90=A6=E4=BF=9D=E7=95=99=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E4=B8=8A=E7=9A=84=E9=85=8D=E7=BD=AE/=E6=80=BB=E6=98=AF?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=88=87=E6=8D=A2=E9=9B=86=E7=BE=A4=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=8F=97=E6=89=80=E5=B1=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/servers/server/settings/index.go     | 16 +++++++++-------
 .../@default/clusters/cluster/node/install.html  |  1 +
 .../@default/servers/server/settings/index.html  | 14 +++++++++-----
 .../@default/servers/server/settings/index.js    |  1 +
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go
index a6b73987..bab10874 100644
--- a/internal/web/actions/default/servers/server/settings/index.go
+++ b/internal/web/actions/default/servers/server/settings/index.go
@@ -147,13 +147,14 @@ func (this *IndexAction) RunGet(params struct {
 
 // RunPost 保存
 func (this *IndexAction) RunPost(params struct {
-	ServerId    int64
-	Name        string
-	Description string
-	ClusterId   int64
-	GroupIds    []int64
-	IsOn        bool
-	UserPlanId  int64
+	ServerId       int64
+	Name           string
+	Description    string
+	ClusterId      int64
+	KeepOldConfigs bool
+	GroupIds       []int64
+	IsOn           bool
+	UserPlanId     int64
 
 	Must *actions.Must
 }) {
@@ -174,6 +175,7 @@ func (this *IndexAction) RunPost(params struct {
 		Name:           params.Name,
 		Description:    params.Description,
 		NodeClusterId:  params.ClusterId,
+		KeepOldConfigs: params.KeepOldConfigs,
 		IsOn:           params.IsOn,
 		ServerGroupIds: params.GroupIds,
 	})
diff --git a/web/views/@default/clusters/cluster/node/install.html b/web/views/@default/clusters/cluster/node/install.html
index 9e960410..535be123 100644
--- a/web/views/@default/clusters/cluster/node/install.html
+++ b/web/views/@default/clusters/cluster/node/install.html
@@ -31,6 +31,7 @@
     endpoints: [ {{apiEndpoints}} ]
 nodeId: "{{node.uniqueId}}"
 secret: "{{node.secret}}"</source-code-box>
+                <p class="comment">手动替换edge-node安装目录下的<code-label>configs/api.yaml</code-label>文件，然后重新启动生效；如果此文件不存在，则需要创建。</p>
             </td>
         </tr>
         <tr>
diff --git a/web/views/@default/servers/server/settings/index.html b/web/views/@default/servers/server/settings/index.html
index 6cf3891f..9051279e 100644
--- a/web/views/@default/servers/server/settings/index.html
+++ b/web/views/@default/servers/server/settings/index.html
@@ -29,16 +29,20 @@
                 </td>
             </tr>
 			<tr>
-				<td>部署的集群 *</td>
+				<td :class="{'color-border':server.clusterId != oldClusterId}">部署的集群 *</td>
 				<td>
-                    <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">
+					<select class="ui dropdown auto-width" name="clusterId" v-model="server.clusterId" >
 						<option v-for="cluster in clusters" :value="cluster.id">{{cluster.name}}</option>
 					</select>
 				</td>
 			</tr>
+            <tr v-show="server.clusterId != oldClusterId">
+                <td class="color-border">是否保留原集群配置</td>
+                <td>
+                    <checkbox name="keepOldConfigs" checked="checked"></checkbox>
+                    <p class="comment">选中表示在先前的集群节点上仍然保留当前服务的配置，直至节点配置全部刷新时才会删除；不选中，则表示立即删除原集群上关于当前服务的配置。</p>
+                </td>
+            </tr>
 			<tr>
 				<td>服务类型 *</td>
 				<td>
diff --git a/web/views/@default/servers/server/settings/index.js b/web/views/@default/servers/server/settings/index.js
index a03b7917..3189b9e5 100644
--- a/web/views/@default/servers/server/settings/index.js
+++ b/web/views/@default/servers/server/settings/index.js
@@ -7,6 +7,7 @@ Tea.context(function () {
 	this.userId = 0
 	this.plans = []
 	this.userPlanId = 0
+	this.oldClusterId = this.server.clusterId
 
 	if (this.userPlan != null) {
 		this.userPlanId = this.userPlan.id