调整版本号

internal/const/const.go

@@ -1,7 +1,7 @@
 package teaconst
 
 const (
-	Version = "0.2.6"
+	Version = "0.2.7"
 
 	ProductName   = "Edge Admin"
 	ProcessName   = "edge-admin"

internal/web/actions/default/clusters/grants/createPopup.go

@@ -43,6 +43,9 @@ func (this *CreatePopupAction) RunPost(params struct {
 			this.FailField("username", "请输入SSH登录用户名")
 		}
 	case "privateKey":
+		if len(params.Username) == 0 {
+			this.FailField("username", "请输入SSH登录用户名")
+		}
 		if len(params.PrivateKey) == 0 {
 			this.FailField("privateKey", "请输入RSA私钥")
 		}

internal/web/actions/default/clusters/grants/updatePopup.go

@@ -73,6 +73,9 @@ func (this *UpdatePopupAction) RunPost(params struct {
 			this.FailField("username", "请输入SSH登录用户名")
 		}
 	case "privateKey":
+		if len(params.Username) == 0 {
+			this.FailField("username", "请输入SSH登录用户名")
+		}
 		if len(params.PrivateKey) == 0 {
 			this.FailField("privateKey", "请输入RSA私钥")
 		}

web/public/js/components/grant/grant-selector.js

@@ -23,7 +23,7 @@ Vue.component("grant-selector", {
 		// 创建授权
 		create: function () {
 			teaweb.popup("/clusters/grants/createPopup", {
-				height: "31em",
+				height: "26em",
 				callback: (resp) => {
 					this.grantId = resp.data.grant.id;
 					if (this.grantId > 0) {
@@ -40,7 +40,7 @@ Vue.component("grant-selector", {
 				return;
 			}
 			teaweb.popup("/clusters/grants/updatePopup?grantId=" + this.grant.id, {
-				height: "31em",
+				height: "26em",
 				callback: (resp) => {
 					this.grant = resp.data.grant;
 				}

web/views/@default/clusters/cluster/installRemote.js

@@ -114,6 +114,7 @@ Tea.context(function () {
                                     case "EMPTY_GRANT":
                                         teaweb.warn("需要填写SSH登录信息", function () {
                                             teaweb.popup("/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+												height: "30em",
                                                 callback: function () {
                                                     teaweb.reload()
                                                 }
@@ -123,6 +124,7 @@ Tea.context(function () {
                                     case "SSH登录失败，请检查设置":
                                         teaweb.warn("需要填写SSH登录信息", function () {
                                             teaweb.popup("/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+												height: "30em",
                                                 callback: function () {
                                                     teaweb.reload()
                                                 }

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

@@ -60,6 +60,7 @@ Tea.context(function () {
                     case "EMPTY_GRANT":
                         teaweb.warn("需要填写SSH登录信息", function () {
                             teaweb.popup("/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+                            	height: "30em",
                                 callback: function () {
                                     that.install()
                                 }
@@ -69,6 +70,7 @@ Tea.context(function () {
                     case "SSH_LOGIN_FAILED":
                         teaweb.warn("SSH登录失败，请检查设置", function () {
                             teaweb.popup("/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+								height: "30em",
                                 callback: function () {
                                     that.install()
                                 }

web/views/@default/clusters/cluster/updateNodeSSH.js

@@ -0,0 +1,5 @@
+Tea.context(function () {
+	if (this.params.port <= 0) {
+		this.params.port = 22
+	}
+})

web/views/@default/clusters/cluster/upgradeRemote.js

@@ -114,6 +114,7 @@ Tea.context(function () {
                                     case "EMPTY_GRANT":
                                         teaweb.warn("需要填写SSH登录信息", function () {
                                             teaweb.popup("/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+												height: "30em",
                                                 callback: function () {
                                                     teaweb.reload()
                                                 }

web/views/@default/clusters/grants/createPopup.html

@@ -37,6 +37,13 @@
 
 		<!-- 私钥 -->
 		<tbody v-if="method == 'privateKey'">
+            <tr>
+                <td>SSH用户名 *</td>
+                <td>
+                    <input type="text" name="username" maxlength="100"/>
+                    <p class="comment">SSH登录用户名。</p>
+                </td>
+            </tr>
 			<tr>
 				<td>RSA私钥 *</td>
 				<td>

web/views/@default/clusters/grants/updatePopup.html

@@ -39,6 +39,13 @@
 
 		<!-- 私钥 -->
 		<tbody v-if="method == 'privateKey'">
+            <tr>
+                <td>SSH用户名 *</td>
+                <td>
+                    <input type="text" name="username" maxlength="100" v-model="grant.username"/>
+                    <p class="comment">SSH登录用户名。</p>
+                </td>
+            </tr>
 			<tr>
 				<td>RSA私钥 *</td>
 				<td>

web/views/@default/ns/clusters/cluster/node/install.js

@@ -60,6 +60,7 @@ Tea.context(function () {
                     case "EMPTY_GRANT":
                         teaweb.warn("需要填写SSH登录信息", function () {
                             teaweb.popup("/ns/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+								height: "30em",
                                 callback: function () {
                                     that.install()
                                 }
@@ -69,6 +70,7 @@ Tea.context(function () {
                     case "SSH_LOGIN_FAILED":
                         teaweb.warn("SSH登录失败，请检查设置", function () {
                             teaweb.popup("/ns/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+								height: "30em",
                                 callback: function () {
                                     that.install()
                                 }