diff --git a/internal/web/actions/default/clusters/grants/create.go b/internal/web/actions/default/clusters/grants/create.go index f40af196..9cf57929 100644 --- a/internal/web/actions/default/clusters/grants/create.go +++ b/internal/web/actions/default/clusters/grants/create.go @@ -42,6 +42,9 @@ func (this *CreateAction) 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私钥") } diff --git a/internal/web/actions/default/clusters/grants/update.go b/internal/web/actions/default/clusters/grants/update.go index 10380aa7..a3f2f9cb 100644 --- a/internal/web/actions/default/clusters/grants/update.go +++ b/internal/web/actions/default/clusters/grants/update.go @@ -74,6 +74,9 @@ func (this *UpdateAction) 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私钥") } diff --git a/web/views/@default/clusters/grants/create.html b/web/views/@default/clusters/grants/create.html index baed6f48..82976d7e 100644 --- a/web/views/@default/clusters/grants/create.html +++ b/web/views/@default/clusters/grants/create.html @@ -39,6 +39,13 @@ + + SSH用户名 * + + +

SSH登录用户名。

+ + RSA私钥 * diff --git a/web/views/@default/clusters/grants/grant.html b/web/views/@default/clusters/grants/grant.html index be598164..78099f04 100644 --- a/web/views/@default/clusters/grants/grant.html +++ b/web/views/@default/clusters/grants/grant.html @@ -1,5 +1,6 @@ {$layout} {$template "grant_menu"} +{$template "/code_editor"} @@ -34,10 +35,16 @@ + + + + diff --git a/web/views/@default/clusters/grants/test.html b/web/views/@default/clusters/grants/test.html index f8f2fda4..b18f89eb 100644 --- a/web/views/@default/clusters/grants/test.html +++ b/web/views/@default/clusters/grants/test.html @@ -42,10 +42,14 @@ + + + + diff --git a/web/views/@default/clusters/grants/update.html b/web/views/@default/clusters/grants/update.html index 17b40d0f..16135728 100644 --- a/web/views/@default/clusters/grants/update.html +++ b/web/views/@default/clusters/grants/update.html @@ -40,6 +40,13 @@ + + + +
SSH用户名{{grant.username}} +

SSH登录用户名。

+
RSA私钥 - {{grant.privateKey}} + {{grant.privateKey}}

用来生成登录SSH公钥的私钥

SSH用户名{{grant.username}}
RSA私钥 - {{grant.privateKey}} +
{{grant.privateKey}}
SSH用户名 * + +

SSH登录用户名。

+
RSA私钥 *