From 282457d53d6a7d7de5c69283b512afe11633ce7e Mon Sep 17 00:00:00 2001 From: lzh Date: Wed, 14 Jan 2026 10:42:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20Jenkinsfile=E4=BF=AE=E5=A4=8D2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 4 ++++ docker-compose.core.yml | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 910b3f6..ff61760 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -278,6 +278,10 @@ pipeline { backupCurrentDeployment(sortedServices) } + // 【新增】同步最新的 docker-compose.core.yml 到部署服务器 + echo "📂 Syncing docker-compose.core.yml to deploy host..." + sh "scp -o StrictHostKeyChecking=no -i ${env.SSH_KEY} docker-compose.core.yml root@${env.DEPLOY_HOST}:${env.DEPLOY_PATH}/" + try { // 串行部署（保证依赖关系） sortedServices.each { service -> diff --git a/docker-compose.core.yml b/docker-compose.core.yml index 5c6762a..c231059 100644 --- a/docker-compose.core.yml +++ b/docker-compose.core.yml @@ -23,9 +23,9 @@ services: # ===== Nacos 配置 ===== SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "aiot-platform" # TODO: 填入实际的命名空间 UUID + SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # TODO: 填入实际的命名空间 UUID SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "aiot-platform" # TODO: 填入实际的命名空间 UUID + SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # TODO: 填入实际的命名空间 UUID SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 # ===== Redis 配置 ===== @@ -59,9 +59,9 @@ services: # Nacos SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "aiot-platform" # TODO: 填入命名空间 UUID + SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # TODO: 填入命名空间 UUID SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "aiot-platform" # TODO: 填入命名空间 UUID + SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" # TODO: 填入命名空间 UUID SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 # 数据库 @@ -101,9 +101,9 @@ services: JAVA_OPTS: "-Xms512m -Xmx1024m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs" SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "aiot-platform" + SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "aiot-platform" + SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://172.17.16.14:3306/aiot_platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true @@ -136,9 +136,9 @@ services: JAVA_OPTS: "-Xms1024m -Xmx2048m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs" SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "aiot-platform" + SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "aiot-platform" + SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://172.17.16.14:3306/aiot_platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true @@ -178,9 +178,9 @@ services: JAVA_OPTS: "-Xms1024m -Xmx2048m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs" SPRING_CLOUD_NACOS_CONFIG_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "aiot-platform" + SPRING_CLOUD_NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" SPRING_CLOUD_NACOS_SERVER_ADDR: 172.17.16.14:8848 - SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "aiot-platform" + SPRING_CLOUD_NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395" SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.17.16.14 SPRING_DATA_REDIS_HOST: 172.17.16.14