From 85eaf5d4c0ed9a534088f61f62d15b9a85152c67 Mon Sep 17 00:00:00 2001 From: zhangchenhao Date: Mon, 26 May 2025 14:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=9D=A1=E4=BB=B6=E5=88=86=E6=94=AF=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E8=8A=82=E7=82=B9=E6=97=A0=E6=B3=95=E5=88=B0=E8=BE=BE?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8Dssh=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=B8=8D=E5=85=BC=E5=AE=B9IPv6=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/internal/cert/deploy/ssh.go | 7 +++++++ backend/internal/workflow/workflow.go | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/backend/internal/cert/deploy/ssh.go b/backend/internal/cert/deploy/ssh.go index eff838b..07a953d 100644 --- a/backend/internal/cert/deploy/ssh.go +++ b/backend/internal/cert/deploy/ssh.go @@ -273,7 +273,14 @@ func SSHAPITest(providerID string) error { default: port = "22" } + IPtype := public.CheckIPType(providerConfig.Host) + if IPtype == "IPv6" { + providerConfig.Host = "[" + providerConfig.Host + "]" + } addr := fmt.Sprintf("%s:%s", providerConfig.Host, port) + if providerConfig.Mode == "" || providerConfig.Mode == "password" { + providerConfig.PrivateKey = "" + } authMethods, err := buildAuthMethods(providerConfig.Password, providerConfig.PrivateKey) if err != nil { diff --git a/backend/internal/workflow/workflow.go b/backend/internal/workflow/workflow.go index 53d682d..a10d3f2 100644 --- a/backend/internal/workflow/workflow.go +++ b/backend/internal/workflow/workflow.go @@ -264,7 +264,10 @@ func RunNode(node *WorkflowNode, ctx *ExecutionContext) error { lastStatus := ctx.GetStatus(node.Config["fromNodeId"].(string)) for _, branch := range node.ConditionNodes { if branch.Config["type"] == string(lastStatus) { - return RunNode(branch, ctx) + err := RunNode(branch, ctx) + if err != nil { + return fmt.Errorf("执行条件分支失败: %v", err) + } } } }