换成单集群模式

EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.html

@@ -2,16 +2,17 @@
 {$template "node_menu"}
 {$template "/code_editor"}
 
+<!-- 已安装 -->
 <div v-if="node.isInstalled">
     <div class="ui message green">当前节点为已安装状态。</div>
-    <a href="" @click.prevent="updateNodeIsInstalled(false)">[修改为未安装]</a>
+    <a href="" @click.prevent="updateNodeIsInstalled(false)">[重新安装]</a>
 
     <h4>配置文件</h4>
     <table class="ui table definition selectable">
         <tr>
             <td class="title">配置文件</td>
             <td>
-                configs/api_httpdns.yaml
+                configs/api_httpdns.yaml &nbsp;
                 <download-link :v-element="'rpc-code'" :v-file="'api_httpdns.yaml'">[下载]</download-link>
             </td>
         </tr>
@@ -19,27 +20,45 @@
             <td>配置内容</td>
             <td>
                 <source-code-box id="rpc-code" type="text/yaml">rpc.endpoints: [ {{apiEndpoints}} ]
-    nodeId: "{{node.uniqueId}}"
-    secret: "{{node.secret}}"</source-code-box>
+                    nodeId: "{{node.uniqueId}}"
+                    secret: "{{node.secret}}"</source-code-box>
+                <p class="comment">每个节点的配置文件内容均不相同，不能混用。</p>
             </td>
         </tr>
         <tr>
             <td class="title">安装目录</td>
             <td>
-                <div v-if="node.installDir.length == 0">使用集群设置<span v-if="node.cluster != null && node.cluster.installDir.length > 0">（{{node.cluster.installDir}}）</span></div>
+                <div v-if="node.installDir.length == 0">使用集群设置<span
+                        v-if="node.cluster != null && node.cluster.installDir.length > 0">（{{node.cluster.installDir}}）</span>
+                </div>
                 <span v-else>{{node.installDir}}</span>
             </td>
         </tr>
     </table>
 </div>
 
+<!-- 未安装 -->
 <div v-if="!node.isInstalled">
-    <h4>通过控制台标记安装</h4>
-    <div v-if="installStatus != null && (installStatus.isRunning || installStatus.isFinished)" class="ui segment installing-box">
+    <h4>方法1：通过SSH自动安装</h4>
+
+    <table class="ui table definition selectable">
+        <tr>
+            <td class="title">SSH地址</td>
+            <td>
+                <span v-if="sshAddr.length > 0">{{sshAddr}} &nbsp; <a href=""
+                        @click.prevent="showSSHPopup(nodeId)">[修改]</a></span>
+                <span v-else><span class="red">尚未设置</span> &nbsp; <a href=""
+                        @click.prevent="showSSHPopup(nodeId)">[设置]</a></span>
+            </td>
+        </tr>
+    </table>
+
+    <div v-if="installStatus != null && (installStatus.isRunning || installStatus.isFinished)"
+        class="ui segment installing-box">
         <div v-if="installStatus.isRunning" class="blue">安装中...</div>
         <div v-if="installStatus.isFinished">
-            <span v-if="installStatus.isOk" class="green">安装成功</span>
-            <span v-else class="red">安装失败：{{installStatus.error}}</span>
+            <span v-if="installStatus.isOk" class="green">已安装成功</span>
+            <span v-if="!installStatus.isOk" class="red">安装过程中发生错误：{{installStatus.error}}</span>
         </div>
     </div>
     <div v-if="installStatus != null && installStatus.isFinished">
@@ -49,12 +68,12 @@
         <button class="ui button small primary" type="button" @click.prevent="install()">开始安装</button>
     </div>
 
-    <h4>配置文件</h4>
+    <h4>方法2：手动安装</h4>
     <table class="ui table definition selectable">
         <tr>
             <td class="title">配置文件</td>
             <td>
-                configs/api_httpdns.yaml
+                configs/api_httpdns.yaml &nbsp;
                 <download-link :v-element="'rpc-code'" :v-file="'api_httpdns.yaml'">[下载]</download-link>
             </td>
         </tr>
@@ -62,18 +81,21 @@
             <td>配置内容</td>
             <td>
                 <source-code-box id="rpc-code" type="text/yaml">rpc.endpoints: [ {{apiEndpoints}} ]
-    nodeId: "{{node.uniqueId}}"
-    secret: "{{node.secret}}"</source-code-box>
+                    nodeId: "{{node.uniqueId}}"
+                    secret: "{{node.secret}}"</source-code-box>
+                <p class="comment">每个节点的配置文件内容均不相同，不能混用。</p>
             </td>
         </tr>
         <tr>
             <td class="title">安装目录</td>
             <td>
-                <div v-if="node.installDir.length == 0">使用集群设置<span v-if="node.cluster != null && node.cluster.installDir.length > 0">（{{node.cluster.installDir}}）</span></div>
+                <div v-if="node.installDir.length == 0">使用集群设置<span
+                        v-if="node.cluster != null && node.cluster.installDir.length > 0">（{{node.cluster.installDir}}）</span>
+                </div>
                 <span v-else>{{node.installDir}}</span>
             </td>
         </tr>
     </table>
 
-    <a href="" @click.prevent="updateNodeIsInstalled(true)">[修改为已安装]</a>
-</div>
+    <a href="" @click.prevent="updateNodeIsInstalled(true)">[修改为已安装状态]</a>
+</div>

EdgeAdmin/web/views/@default/httpdns/clusters/cluster/node/install.js

@@ -28,6 +28,7 @@ Tea.context(function () {
         })
     }
 
+    // 刷新状态
     this.reloadStatus = function (nodeId) {
         let that = this
 
@@ -44,10 +45,50 @@ Tea.context(function () {
                 }
 
                 let installStatus = this.installStatus || {}
-                let errorCode = installStatus.errorCode || ""
-                if (errorCode.length > 0) {
+                let errMsg = installStatus.error || ""
+
+                if (installStatus.errorCode != null && installStatus.errorCode.length > 0) {
                     isInstalling = false
-                    teaweb.warn("安装失败：" + (installStatus.error || "未知错误"))
+                }
+
+                switch (installStatus.errorCode) {
+                    case "EMPTY_LOGIN":
+                    case "EMPTY_SSH_HOST":
+                    case "EMPTY_SSH_PORT":
+                    case "EMPTY_GRANT":
+                        teaweb.warn("需要填写SSH登录信息", function () {
+                            teaweb.popup("/httpdns/clusters/updateNodeSSH?nodeId=" + nodeId, {
+                                height: "20em",
+                                callback: function () {
+                                    that.install()
+                                }
+                            })
+                        })
+                        return
+                    case "SSH_LOGIN_FAILED":
+                        teaweb.warn("SSH登录失败，请检查设置", function () {
+                            teaweb.popup("/httpdns/clusters/updateNodeSSH?nodeId=" + nodeId, {
+                                height: "20em",
+                                callback: function () {
+                                    that.install()
+                                }
+                            })
+                        })
+                        return
+                    case "CREATE_ROOT_DIRECTORY_FAILED":
+                        teaweb.warn("创建根目录失败，请检查目录权限或者手工创建：" + errMsg)
+                        return
+                    case "INSTALL_HELPER_FAILED":
+                        teaweb.warn("安装助手失败：" + errMsg)
+                        return
+                    case "TEST_FAILED":
+                        teaweb.warn("环境测试失败：" + errMsg)
+                        return
+                    case "RPC_TEST_FAILED":
+                        teaweb.confirm("html:要安装的节点到API服务之间的RPC通讯测试失败，具体错误：" + errMsg + "，<br/>现在修改API信息？", function () {
+                            window.location = "/settings/api"
+                        })
+                        return
                 }
             })
             .done(function () {
@@ -59,7 +100,7 @@ Tea.context(function () {
 
     this.showSSHPopup = function (nodeId) {
         teaweb.popup("/httpdns/clusters/updateNodeSSH?nodeId=" + nodeId, {
-            height: "30em",
+            height: "20em",
             callback: function () {
                 teaweb.success("保存成功", function () {
                     teaweb.reload()

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

@@ -4,8 +4,8 @@
 
 <h3>修改节点</h3>
 <form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
-    <csrf-token></csrf-token>
     <input type="hidden" name="nodeId" :value="node.id" />
+    <input type="hidden" name="loginId" :value="loginId" />
     <table class="ui table definition selectable">
         <tr>
             <td class="title">节点名称 *</td>