diff --git a/internal/web/actions/default/clusters/cluster/node/install.go b/internal/web/actions/default/clusters/cluster/node/install.go index 25202346..e8c61270 100644 --- a/internal/web/actions/default/clusters/cluster/node/install.go +++ b/internal/web/actions/default/clusters/cluster/node/install.go @@ -2,9 +2,11 @@ package node import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils" + "github.com/TeaOSLab/EdgeCommon/pkg/configutils" "github.com/TeaOSLab/EdgeCommon/pkg/langs/codes" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -109,6 +111,26 @@ func (this *InstallAction) RunGet(params struct { var installerFiles = clusterutils.ListInstallerFiles() this.Data["installerFiles"] = installerFiles + // SSH主机地址 + this.Data["sshAddr"] = "" + if node.NodeLogin != nil && node.NodeLogin.Type == "ssh" && !utils.JSONIsNull(node.NodeLogin.Params) { + var loginParams = maps.Map{} + err = json.Unmarshal(node.NodeLogin.Params, &loginParams) + if err != nil { + this.ErrorPage(err) + return + } + + var host = loginParams.GetString("host") + if len(host) > 0 { + var port = loginParams.GetString("port") + if port == "0" { + port = "22" + } + this.Data["sshAddr"] = configutils.QuoteIP(host) + ":" + port + } + } + this.Show() } diff --git a/internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go b/internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go index df472d64..9eb75fe6 100644 --- a/internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go +++ b/internal/web/actions/default/clusters/cluster/node/settings/ssh/index.go @@ -48,7 +48,7 @@ func (this *IndexAction) RunGet(params struct { } var grantMap = maps.Map{} - grantId := loginParams.GetInt64("grantId") + var grantId = loginParams.GetInt64("grantId") if grantId > 0 { grantResp, err := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{NodeGrantId: grantId}) if err != nil { diff --git a/web/views/@default/clusters/cluster/node/install.html b/web/views/@default/clusters/cluster/node/install.html index 5e250495..9d812da0 100644 --- a/web/views/@default/clusters/cluster/node/install.html +++ b/web/views/@default/clusters/cluster/node/install.html @@ -11,6 +11,15 @@
| SSH地址 | ++ {{sshAddr}} [修改] + 尚未设置 [设置] + | +