From 548671668f096ba10d3721d0594577f739bc3e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Fri, 14 Aug 2026 16:33:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20Jenkinsfile=20SSH=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一使用 sshagent + 密钥认证替代 sshpass + 密码认证 - 所有项目使用统一的 SSH 凭证 deploy-server-ssh - 修复 SSH 命令引号闭合问题,改用单行命令格式 - 移除 PROJECT_CONFIG 中的 sshCredId 字段,新增 deployUser 字段 Co-Authored-By: Claude Sonnet 4.6 --- Jenkinsfile | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3203077f7..1725b2a73 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -138,10 +138,8 @@ pipeline { ssh -o StrictHostKeyChecking=no \ -o HostKeyAlgorithms=+ssh-rsa \ -o PubkeyAcceptedKeyTypes=+ssh-rsa \ - ${deployUser}@${cfg.deployHost} ' - mkdir -p /home/docker/fangjia-script/scripts/fangjia - mkdir -p /home/docker/fangjia-script/logs - ' + ${deployUser}@${cfg.deployHost} \ + 'mkdir -p /home/docker/fangjia-script/scripts/fangjia && mkdir -p /home/docker/fangjia-script/logs' # 上传 fat jar scp -o StrictHostKeyChecking=no \ @@ -168,9 +166,8 @@ pipeline { ssh -o StrictHostKeyChecking=no \ -o HostKeyAlgorithms=+ssh-rsa \ -o PubkeyAcceptedKeyTypes=+ssh-rsa \ - ${deployUser}@${cfg.deployHost} ' - docker exec fangjia-script kill -USR2 1 - ' + ${deployUser}@${cfg.deployHost} \ + 'docker exec fangjia-script kill -USR2 1' """ } else { if(cfg.deployHost instanceof String){ @@ -178,20 +175,18 @@ pipeline { ssh -o StrictHostKeyChecking=no \ -o HostKeyAlgorithms=+ssh-rsa \ -o PubkeyAcceptedKeyTypes=+ssh-rsa \ - ${deployUser}@${cfg.deployHost} ' - cd ${cfg.deployBase}/${cfg.composeDir} - docker compose up -d --no-deps --force-recreate ${cfg.serviceName} - """ + ${deployUser}@${cfg.deployHost} \ + 'cd ${cfg.deployBase}/${cfg.composeDir} && docker compose up -d --no-deps --force-recreate ${cfg.serviceName}' + """ }else{ for(def host in cfg.deployHost){ sh """ ssh -o StrictHostKeyChecking=no \ -o HostKeyAlgorithms=+ssh-rsa \ -o PubkeyAcceptedKeyTypes=+ssh-rsa \ - ${deployUser}@${host} ' - cd ${cfg.deployBase}/${cfg.composeDir} - docker compose up -d --no-deps --force-recreate ${cfg.serviceName} - """ + ${deployUser}@${host} \ + 'cd ${cfg.deployBase}/${cfg.composeDir} && docker compose up -d --no-deps --force-recreate ${cfg.serviceName}' + """ } }