XW-AIOT/aiot-platform-cloud
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Jenkinsfile修复2
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
lzh
2026-01-14 10:42:13 +08:00
parent c80c2121e6
commit 282457d53d
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@@ -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 ->

20
docker-compose.core.yml
View File

@@ -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