From a2b5ce2ffc0ebfac5dbb29b587b25f0fe62476ee Mon Sep 17 00:00:00 2001
From: panjunjie <46790855@qq.com>
Date: Mon, 10 Nov 2025 01:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=90=AF=20nginx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: panjunjie <46790855@qq.com>
---
 java-mall-app-shop-admin/Jenkinsfile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/java-mall-app-shop-admin/Jenkinsfile b/java-mall-app-shop-admin/Jenkinsfile
index cc23b63..1aa1bd2 100644
--- a/java-mall-app-shop-admin/Jenkinsfile
+++ b/java-mall-app-shop-admin/Jenkinsfile
@@ -68,12 +68,22 @@ pipeline {
                         ${DEPLOY_DIR}/ \
                         root@${SLAVE_IP}:${SLAVE_DEPLOY_DIR}/
 
-                    # 检查同步结果
+	                # 步骤3：远程重启从节点 Nginx（加载新代码）
+                    echo "第三步：重启从节点 Nginx 服务..."
+                    ssh -i ${SSH_KEY} \
+                        -p ${SSH_PORT} \
+                        -o StrictHostKeyChecking=no \
+                        -o ConnectTimeout=10 \
+                        root@${SLAVE_IP} \
+                        "systemctl restart nginx"
+
+                    # 检查 Nginx 重启结果（容错处理：重启失败不终止流程，仅告警）
                     if [ \$? -eq 0 ]; then
-                        echo "✅ 从节点同步成功！主从目录完全一致"
+                        echo "✅ 从节点 Nginx 重启成功！新代码已生效"
                     else
-                        echo "❌ 从节点同步失败！请查看 Jenkins 控制台日志"
-                        exit 1
+                        echo "⚠️  警告：从节点 Nginx 重启失败！请手动执行以下命令排查："
+                        echo "ssh -i ${SSH_KEY} -p ${SSH_PORT} root@${SLAVE_IP} 'systemctl status nginx'"
+                        echo "（同步已完成，仅 Nginx 重启失败，不影响代码一致性）"
                     fi
                 """
             }