换成单集群模式

EdgeAdmin/internal/web/actions/default/httpdns/clusters/updateNodeSSH.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/iwind/TeaGo/actions"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 )
 
@@ -47,25 +47,36 @@ func (this *UpdateNodeSSHAction) RunGet(params struct {
 	}
 	this.Data["loginId"] = 0
 
-	if resp.GetNode() != nil && len(resp.GetNode().GetInstallStatusJSON()) > 0 {
-		installStatus := maps.Map{}
-		_ = json.Unmarshal(resp.GetNode().GetInstallStatusJSON(), &installStatus)
-		sshInfo := installStatus.GetMap("ssh")
-		if sshInfo != nil {
-			if host := strings.TrimSpace(sshInfo.GetString("host")); len(host) > 0 {
-				loginParams["host"] = host
-			}
-			if port := sshInfo.GetInt("port"); port > 0 {
-				loginParams["port"] = port
-			}
-			if grantID := sshInfo.GetInt64("grantId"); grantID > 0 {
-				loginParams["grantId"] = grantID
-			}
+	// 从 NodeLogin 读取 SSH 信息
+	if resp.GetNode() != nil && resp.GetNode().GetNodeLogin() != nil {
+		nodeLogin := resp.GetNode().GetNodeLogin()
+		this.Data["loginId"] = nodeLogin.Id
+		if len(nodeLogin.Params) > 0 {
+			_ = json.Unmarshal(nodeLogin.Params, &loginParams)
 		}
 	}
 
 	this.Data["params"] = loginParams
-	this.Data["grant"] = nil
+
+	// 认证信息
+	grantId := loginParams.GetInt64("grantId")
+	var grantMap maps.Map = nil
+	if grantId > 0 {
+		grantResp, grantErr := this.RPC().NodeGrantRPC().FindEnabledNodeGrant(this.AdminContext(), &pb.FindEnabledNodeGrantRequest{
+			NodeGrantId: grantId,
+		})
+		if grantErr == nil && grantResp.GetNodeGrant() != nil {
+			g := grantResp.GetNodeGrant()
+			grantMap = maps.Map{
+				"id":         g.Id,
+				"name":       g.Name,
+				"method":     g.Method,
+				"methodName": g.Method,
+			}
+		}
+	}
+	this.Data["grant"] = grantMap
+
 	this.Show()
 }
 
@@ -93,46 +104,23 @@ func (this *UpdateNodeSSHAction) RunPost(params struct {
 		this.Fail("SSH 主机地址 IP 格式错误")
 	}
 
-	resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{
-		NodeId: params.NodeId,
-	})
-	if err != nil {
-		this.ErrorPage(err)
-		return
-	}
-	node := resp.GetNode()
-	if node == nil {
-		this.Fail("节点不存在")
-		return
+	login := &pb.NodeLogin{
+		Id:   params.LoginId,
+		Name: "SSH",
+		Type: "ssh",
+		Params: maps.Map{
+			"grantId": params.GrantId,
+			"host":    params.SshHost,
+			"port":    params.SshPort,
+		}.AsJSON(),
 	}
 
-	installStatus := maps.Map{
-		"isRunning":  false,
-		"isFinished": true,
-		"isOk":       node.GetIsInstalled(),
-		"error":      "",
-		"errorCode":  "",
-	}
-	if len(node.GetInstallStatusJSON()) > 0 {
-		_ = json.Unmarshal(node.GetInstallStatusJSON(), &installStatus)
-	}
-	installStatus["ssh"] = maps.Map{
-		"host":    params.SshHost,
-		"port":    params.SshPort,
-		"grantId": params.GrantId,
-	}
-
-	installStatusJSON, _ := json.Marshal(installStatus)
-	_, err = this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNodeStatus(this.AdminContext(), &pb.UpdateHTTPDNSNodeStatusRequest{
-		NodeId:            params.NodeId,
-		IsUp:              node.GetIsUp(),
-		IsInstalled:       node.GetIsInstalled(),
-		IsActive:          node.GetIsActive(),
-		StatusJSON:        node.GetStatusJSON(),
-		InstallStatusJSON: installStatusJSON,
+	_, err := this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNodeLogin(this.AdminContext(), &pb.UpdateHTTPDNSNodeLoginRequest{
+		NodeId:    params.NodeId,
+		NodeLogin: login,
 	})
 	if err != nil {
-		this.ErrorPage(err)
+		this.Fail("保存SSH登录信息失败: " + err.Error())
 		return
 	}