管理端全部功能跑通

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

@@ -1,10 +1,10 @@
 <second-menu>
     <menu-item :href="'/httpdns/clusters/cluster?clusterId=' + currentCluster.id">{{currentCluster.name}}</menu-item>
     <span class="item disabled" style="padding-left: 0; padding-right: 0">&raquo;</span>
-	<menu-item :href="'/httpdns/clusters/cluster?clusterId=' + clusterId">节点列表</menu-item>
-	<span class="item disabled">|</span>
-	<menu-item :href="'/httpdns/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + nodeId" code="node">节点详情</menu-item>
+    <menu-item :href="'/httpdns/clusters/cluster?clusterId=' + clusterId">节点列表</menu-item>
+    <span class="item disabled">|</span>
+    <menu-item :href="'/httpdns/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + nodeId" code="node">节点详情</menu-item>
     <menu-item :href="'/httpdns/clusters/cluster/node/logs?clusterId=' + clusterId + '&nodeId=' + nodeId" code="log">运行日志</menu-item>
-	<menu-item :href="'/httpdns/clusters/cluster/node/update?clusterId=' + clusterId + '&nodeId=' + nodeId" code="update">修改设置</menu-item>
-	<menu-item :href="'/httpdns/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + nodeId" code="install">安装节点</menu-item>
-</second-menu>
+    <menu-item :href="'/httpdns/clusters/cluster/node/update?clusterId=' + clusterId + '&nodeId=' + nodeId" code="update">修改设置</menu-item>
+    <menu-item :href="'/httpdns/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + nodeId" code="install">安装节点</menu-item>
+</second-menu>

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

@@ -2,17 +2,16 @@
 {$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 &nbsp;
+                configs/api_httpdns.yaml
                 <download-link :v-element="'rpc-code'" :v-file="'api_httpdns.yaml'">[下载]</download-link>
             </td>
         </tr>
@@ -20,45 +19,27 @@
             <td>配置内容</td>
             <td>
                 <source-code-box id="rpc-code" type="text/yaml">rpc.endpoints: [ {{apiEndpoints}} ]
-                    nodeId: "{{node.uniqueId}}"
-                    secret: "{{node.secret}}"</source-code-box>
-                <p class="comment">每个节点的配置文件内容均不相同，不能混用。</p>
+    nodeId: "{{node.uniqueId}}"
+    secret: "{{node.secret}}"</source-code-box>
             </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>方法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">
+    <h4>通过控制台标记安装</h4>
+    <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-if="!installStatus.isOk" class="red">安装过程中发生错误：{{installStatus.error}}</span>
+            <span v-if="installStatus.isOk" class="green">安装成功</span>
+            <span v-else class="red">安装失败：{{installStatus.error}}</span>
         </div>
     </div>
     <div v-if="installStatus != null && installStatus.isFinished">
@@ -68,12 +49,12 @@
         <button class="ui button small primary" type="button" @click.prevent="install()">开始安装</button>
     </div>
 
-    <h4>方法2：手动安装</h4>
+    <h4>配置文件</h4>
     <table class="ui table definition selectable">
         <tr>
             <td class="title">配置文件</td>
             <td>
-                configs/api_httpdns.yaml &nbsp;
+                configs/api_httpdns.yaml
                 <download-link :v-element="'rpc-code'" :v-file="'api_httpdns.yaml'">[下载]</download-link>
             </td>
         </tr>
@@ -81,20 +62,18 @@
             <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>
             </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

@@ -7,7 +7,6 @@ Tea.context(function () {
 
     this.install = function () {
         isInstalling = true
-
         this.$post("$")
             .params({
                 nodeId: this.nodeId
@@ -17,8 +16,8 @@ Tea.context(function () {
 
     this.updateNodeIsInstalled = function (isInstalled) {
         let msg = isInstalled
-            ? "html:确认要将当前节点修改为 <strong>已安装</strong> 状态？"
-            : "html:确认要将当前节点修改为 <strong>未安装</strong> 状态？"
+            ? "html:确认要将当前节点修改为 <strong>已安装</strong> 状态吗？"
+            : "html:确认要将当前节点修改为 <strong>未安装</strong> 状态吗？"
         teaweb.confirm(msg, function () {
             this.$post("/httpdns/clusters/cluster/node/updateInstallStatus")
                 .params({
@@ -44,60 +43,16 @@ Tea.context(function () {
                     return
                 }
 
-                let currentNodeId = this.node.id
                 let installStatus = this.installStatus || {}
-                let errMsg = installStatus.error || ""
                 let errorCode = installStatus.errorCode || ""
-
                 if (errorCode.length > 0) {
                     isInstalling = false
-                }
-
-                switch (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=" + currentNodeId, {
-                                height: "30em",
-                                callback: function () {
-                                    that.install()
-                                }
-                            })
-                        })
-                        return
-                    case "SSH_LOGIN_FAILED":
-                        teaweb.warn("SSH 登录失败，请检查设置", function () {
-                            teaweb.popup("/httpdns/clusters/updateNodeSSH?nodeId=" + currentNodeId, {
-                                height: "30em",
-                                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
-                    default:
-                        break
+                    teaweb.warn("安装失败：" + (installStatus.error || "未知错误"))
                 }
             })
             .done(function () {
                 this.$delay(function () {
-                    this.reloadStatus(nodeId)
+                    that.reloadStatus(nodeId)
                 }, 1000)
             })
     }

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

@@ -7,22 +7,22 @@
     <input type="hidden" name="nodeId" :value="nodeId"/>
     <div class="ui fields inline">
         <div class="ui field">
-            <input type="text" name="dayFrom" placeholder="开始日期" v-model="dayFrom" value="" style="width:8em" id="day-from-picker"/>
+            <input type="text" name="dayFrom" placeholder="开始日期" v-model="dayFrom" style="width:8em" id="day-from-picker"/>
         </div>
         <div class="ui field">
-            <input type="text" name="dayTo" placeholder="结束日期" v-model="dayTo" value="" style="width:8em" id="day-to-picker"/>
+            <input type="text" name="dayTo" placeholder="结束日期" v-model="dayTo" style="width:8em" id="day-to-picker"/>
         </div>
         <div class="ui field">
             <select class="ui dropdown" name="level" v-model="level">
                 <option value="">[级别]</option>
                 <option value="error">错误</option>
-                <option value="warning">警告</option>
+                <option value="warning">告警</option>
                 <option value="info">信息</option>
                 <option value="success">成功</option>
             </select>
         </div>
         <div class="ui field">
-            <input type="text" name="keyword" style="width:10em" v-model="keyword" placeholder="关键词"/>
+            <input type="text" name="keyword" style="width:14em" v-model="keyword" placeholder="类型/模块/详情"/>
         </div>
         <div class="ui field">
             <button type="submit" class="ui button">查询</button>
@@ -36,16 +36,13 @@
 <p class="comment" v-if="logs.length == 0">暂时还没有日志。</p>
 
 <table class="ui table selectable" v-if="logs.length > 0">
-    <thead>
-        <tr>
-
+    <tbody>
+        <tr v-for="log in logs">
+            <td>
+                <node-log-row :v-log="log" :v-keyword="keyword"></node-log-row>
+            </td>
         </tr>
-    </thead>
-    <tr v-for="log in logs">
-        <td>
-            <node-log-row :v-log="log" :v-keyword="keyword"></node-log-row>
-        </td>
-    </tr>
+    </tbody>
 </table>
 
-<div class="page" v-html="page"></div>
+<div class="page" v-html="page"></div>

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>
@@ -13,66 +13,50 @@
                 <input type="text" name="name" maxlength="50" ref="focus" v-model="node.name" />
             </td>
         </tr>
-        <tr>
-            <td>IP地址 *</td>
-            <td>
-                <node-ip-addresses-box role="ns" :v-ip-addresses="node.ipAddresses"></node-ip-addresses-box>
-                <p class="comment">用于访问节点和处理HTTPDNS解析请求等。</p>
-            </td>
-        </tr>
         <tr>
             <td>所属集群</td>
             <td>
-                <select class="ui dropdown" name="clusterId" style="width:10em" v-model="clusterId">
+                <select class="ui dropdown" name="clusterId" style="width:16em" v-model="clusterId" disabled>
                     <option v-for="cluster in clusters" :value="cluster.id">{{cluster.name}}</option>
                 </select>
+                <p class="comment">当前版本暂不支持在此页面变更节点所属集群。</p>
             </td>
         </tr>
         <tr>
-            <td colspan="2"><more-options-indicator></more-options-indicator></td>
+            <td>IP地址</td>
+            <td>
+                <node-ip-addresses-box :v-ip-addresses="ipAddresses" :v-node-id="node.id"></node-ip-addresses-box>
+            </td>
+        </tr>
+        <tr>
+            <td>启用当前节点</td>
+            <td>
+                <div class="ui checkbox">
+                    <input type="checkbox" name="isOn" value="1" v-model="node.isOn" />
+                    <label></label>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td>SSH 主机地址</td>
+            <td>
+                <input type="text" name="sshHost" maxlength="64" v-model="sshHost" />
+                <p class="comment">例如 192.168.1.100</p>
+            </td>
+        </tr>
+        <tr>
+            <td>SSH 主机端口</td>
+            <td>
+                <input type="text" name="sshPort" maxlength="5" v-model="sshPort" style="width: 6em" />
+                <p class="comment">例如 22</p>
+            </td>
+        </tr>
+        <tr>
+            <td>SSH 登录认证</td>
+            <td>
+                <grant-selector :v-grant="grant" :v-node-cluster-id="clusterId"></grant-selector>
+            </td>
         </tr>
-        <tbody v-show="moreOptionsVisible">
-            <tr>
-                <td>SSH主机地址</td>
-                <td>
-                    <input type="text" name="sshHost" maxlength="64" v-model="sshHost" />
-                    <p class="comment">比如192.168.1.100</p>
-                </td>
-            </tr>
-            <tr>
-                <td>SSH主机端口</td>
-                <td>
-                    <input type="text" name="sshPort" maxlength="5" v-model="sshPort" />
-                    <p class="comment">比如22。</p>
-                </td>
-            </tr>
-            <tr>
-                <td>SSH登录认证</td>
-                <td>
-                    <grant-selector :v-grant="grant" :v-node-cluster-id="clusterId"></grant-selector>
-                </td>
-            </tr>
-            <tr>
-                <td class="title">API节点地址</td>
-                <td>
-                    <div style="margin-bottom: 0.5em">
-                        <api-node-addresses-box :v-name="'apiNodeAddrsJSON'"
-                            :v-addrs="apiNodeAddrs"></api-node-addresses-box>
-                    </div>
-                    <p class="comment">当前节点单独使用的API节点设置。<pro-warning-label></pro-warning-label></p>
-                </td>
-            </tr>
-            <tr>
-                <td>启用当前节点</td>
-                <td>
-                    <div class="ui checkbox">
-                        <input type="checkbox" name="isOn" value="1" v-model="node.isOn" />
-                        <label></label>
-                    </div>
-                    <p class="comment">如果不启用此节点，此节点上的所有网站将不能访问。</p>
-                </td>
-            </tr>
-        </tbody>
     </table>
     <submit-btn></submit-btn>
-</form>
+</form>

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

@@ -1,35 +1,25 @@
 Tea.context(function () {
-	this.clusterId = 0;
-	if (this.node.cluster != null && this.node.cluster.id > 0) {
-		this.clusterId = this.node.cluster.id;
-	}
+    if (typeof this.clusterId !== "number" || this.clusterId <= 0) {
+        this.clusterId = 0
+    }
+    if (this.clusterId <= 0 && this.node.cluster != null && this.node.cluster.id > 0) {
+        this.clusterId = this.node.cluster.id
+    }
 
-	this.success = NotifySuccess("保存成功", "/httpdns/clusters/cluster/node?clusterId=" + this.clusterId + "&nodeId=" + this.node.id);
+    this.success = NotifySuccess("保存成功", "/httpdns/clusters/cluster/node?clusterId=" + this.clusterId + "&nodeId=" + this.node.id)
 
-	// 认证相关
-	this.grant = null
+    if (typeof this.sshHost !== "string") {
+        this.sshHost = ""
+    }
 
-	this.sshHost = ""
-	this.sshPort = ""
-	this.loginId = 0
-	if (this.node.login != null) {
-		this.loginId = this.node.login.id
+    let sshPort = parseInt(this.sshPort)
+    if (isNaN(sshPort) || sshPort <= 0) {
+        this.sshPort = 22
+    } else {
+        this.sshPort = sshPort
+    }
 
-		if (this.node.login.params != null) {
-			this.sshHost = this.node.login.params.host
-			if (this.node.login.params.port > 0) {
-				this.sshPort = this.node.login.params.port
-			}
-		}
-
-		if (this.node.login.grant != null && typeof this.node.login.grant.id != "undefined") {
-			this.grant = {
-				id: this.node.login.grant.id,
-				name: this.node.login.grant.name,
-				method: this.node.login.grant.method,
-				methodName: this.node.login.grant.methodName,
-				username: this.node.login.grant.username
-			}
-		}
-	}
-})
+    if (typeof this.loginId !== "number") {
+        this.loginId = 0
+    }
+})