lzh
db91e9503e
之前的参数化（docker-compose.core.yml 用 \${VAR:-default} + .env 注入）让运维要在
两台部署机分别维护 .env，体验跟 prod 现状不一致。改回与 prod 同款：每个环境一个
独立的 compose 文件，配置直接硬编码在 yml 里。
改动：
- 新增 docker-compose.release.yml（release 专用：MySQL aiot-platform-release 库、
Nacos namespace e635b215-...、TDengine database aiot_platform_release、
XXL-Job executor IP=.7、appname 加 -release 后缀、RocketMQ 内网 .7:9876）
- docker-compose.core.yml 完全恢复到 master 版本（prod 文件未做任何改动）
- 删除 env/ 目录（prod.env.example / release.env.example / .gitignore 都不需要了）
- Jenkinsfile：
- Initialize 阶段按分支选 COMPOSE_FILE：master→core.yml、release/next→release.yml
- 所有 docker compose 命令统一用 -f \${env.COMPOSE_FILE}
- Pre-deploy 移除 .env 文件存在性检查
- 删除 checkRemoteEnvFileOrFail helper（不再使用）
application.yaml 里的 \${XXL_JOB_EXECUTOR_APPNAME_SUFFIX:} 与 application-prod.yaml
里的 \${TDENGINE_DATABASE:aiot_platform} 保留——默认值与历史一致，prod 行为零变化，
但给 release.yml 注入这两个变量留了入口。
283 lines
9.8 KiB
YAML
283 lines
9.8 KiB
YAML
version: '3.8'
|
|
|
|
networks:
|
|
default:
|
|
name: 1panel-network
|
|
external: true
|
|
|
|
volumes:
|
|
app-logs:
|
|
|
|
services:
|
|
viewsh-gateway:
|
|
image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-gateway:${IMAGE_TAG:-latest}
|
|
container_name: aiot-gateway
|
|
restart: on-failure:5
|
|
ports:
|
|
- "48080:48080"
|
|
environment:
|
|
# ===== 基础配置 =====
|
|
TZ: Asia/Shanghai
|
|
SPRING_PROFILES_ACTIVE: prod
|
|
|
|
# ===== JVM 配置 =====
|
|
JAVA_OPTS: "-Xms512m -Xmx1024m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs"
|
|
|
|
# ===== Nacos 配置 =====
|
|
NACOS_USERNAME: nacos
|
|
NACOS_PASSWORD: 9oDxX~}e7DeP
|
|
NACOS_ADDR: 172.17.16.7:8848
|
|
NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
|
|
# ===== Redis 配置 =====
|
|
SPRING_DATA_REDIS_HOST: 172.17.16.13
|
|
SPRING_DATA_REDIS_PORT: 6379
|
|
SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
|
|
|
|
volumes:
|
|
- app-logs:/app/logs
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
memory: 1536m
|
|
cpus: '1.0'
|
|
healthcheck:
|
|
test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 12
|
|
start_period: 120s
|
|
|
|
viewsh-module-system-server:
|
|
image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-system-server:${IMAGE_TAG:-latest}
|
|
container_name: aiot-system-server
|
|
restart: on-failure:5
|
|
ports:
|
|
- "48081:48081"
|
|
- "9901:9901"
|
|
environment:
|
|
TZ: Asia/Shanghai
|
|
SPRING_PROFILES_ACTIVE: prod
|
|
JAVA_OPTS: "-Xms512m -Xmx1024m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs"
|
|
|
|
# ===== Nacos 配置 =====
|
|
NACOS_USERNAME: nacos
|
|
NACOS_PASSWORD: 9oDxX~}e7DeP
|
|
NACOS_ADDR: 172.17.16.7:8848
|
|
NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
|
|
# 数据库
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root # TODO: 填入数据库用户名
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "tKi8rfUJjVrf@" # TODO: 填入数据库密码
|
|
|
|
# Redis
|
|
SPRING_DATA_REDIS_HOST: 172.17.16.13
|
|
SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1" # TODO: 填入 Redis 密码
|
|
|
|
# 微信配置 (解决 appid 不能为 null)
|
|
WX_MP_APP_ID: "wx5b23ba7a5589ecbb"
|
|
WX_MP_SECRET: "2a7b3b20c537e52e74afd395eb85f61f"
|
|
WX_MINIAPP_APPID: "wxc4598c446f8a9cb3"
|
|
WX_MINIAPP_SECRET: "4a1a04e07f6a4a0751b39c3064a92c8b"
|
|
|
|
# XXL-Job 调度中心地址
|
|
XXL_JOB_ADMIN_ADDRESSES: http://172.17.16.7:19090/xxl-job-admin
|
|
XXL_JOB_EXECUTOR_IP: 172.17.16.14
|
|
XXL_JOB_EXECUTOR_PORT: 9901
|
|
|
|
volumes:
|
|
- app-logs:/app/logs
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
memory: 1536m
|
|
cpus: '1.0'
|
|
healthcheck:
|
|
test: ["CMD", "curl", "-f", "http://localhost:48081/actuator/health"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 12
|
|
start_period: 120s
|
|
depends_on:
|
|
viewsh-gateway:
|
|
condition: service_healthy
|
|
|
|
viewsh-module-infra-server:
|
|
image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-infra-server:${IMAGE_TAG:-latest}
|
|
container_name: aiot-infra-server
|
|
restart: on-failure:5
|
|
ports:
|
|
- "48082:48082"
|
|
- "9902:9902"
|
|
environment:
|
|
TZ: Asia/Shanghai
|
|
SPRING_PROFILES_ACTIVE: prod
|
|
JAVA_OPTS: "-Xms512m -Xmx1024m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs"
|
|
|
|
NACOS_USERNAME: nacos
|
|
NACOS_PASSWORD: 9oDxX~}e7DeP
|
|
NACOS_ADDR: 172.17.16.7:8848
|
|
NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "tKi8rfUJjVrf@"
|
|
|
|
SPRING_DATA_REDIS_HOST: 172.17.16.13
|
|
SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
|
|
|
|
# XXL-Job 调度中心地址
|
|
XXL_JOB_ADMIN_ADDRESSES: http://172.17.16.7:19090/xxl-job-admin
|
|
XXL_JOB_EXECUTOR_IP: 172.17.16.14
|
|
XXL_JOB_EXECUTOR_PORT: 9902
|
|
|
|
volumes:
|
|
- app-logs:/app/logs
|
|
healthcheck:
|
|
test: ["CMD", "curl", "-f", "http://localhost:48082/actuator/health"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 12
|
|
start_period: 120s
|
|
depends_on:
|
|
viewsh-module-system-server:
|
|
condition: service_healthy
|
|
|
|
viewsh-module-iot-server:
|
|
image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-iot-server:${IMAGE_TAG:-latest}
|
|
container_name: aiot-iot-server
|
|
restart: on-failure:5
|
|
ports:
|
|
- "48091:48091"
|
|
- "9903:9903"
|
|
environment:
|
|
TZ: Asia/Shanghai
|
|
SPRING_PROFILES_ACTIVE: prod
|
|
JAVA_OPTS: "-Xms1024m -Xmx2048m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs"
|
|
|
|
NACOS_USERNAME: nacos
|
|
NACOS_PASSWORD: 9oDxX~}e7DeP
|
|
NACOS_ADDR: 172.17.16.7:8848
|
|
NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "tKi8rfUJjVrf@"
|
|
|
|
SPRING_DATA_REDIS_HOST: 172.17.16.13
|
|
SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
|
|
|
|
ROCKETMQ_NAMESRV_ADDR: rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080
|
|
ROCKETMQ_ACCESS_KEY: ak4wd73bxpv55331e7c5b80
|
|
ROCKETMQ_SECRET_KEY: sk82108944bc0997f7
|
|
|
|
# TDengine
|
|
TDENGINE_HOST: 172.17.16.7
|
|
TDENGINE_PORT: 6041
|
|
TDENGINE_USERNAME: root
|
|
TDENGINE_PASSWORD: taosdata
|
|
|
|
# XXL-Job 调度中心地址
|
|
XXL_JOB_ADMIN_ADDRESSES: http://172.17.16.7:19090/xxl-job-admin
|
|
XXL_JOB_EXECUTOR_IP: 172.17.16.14
|
|
XXL_JOB_EXECUTOR_PORT: 9903
|
|
|
|
volumes:
|
|
- app-logs:/app/logs
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
memory: 2560m
|
|
cpus: '1.5'
|
|
healthcheck:
|
|
test: ["CMD", "curl", "-f", "http://localhost:48091/actuator/health"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 12
|
|
start_period: 120s
|
|
depends_on:
|
|
viewsh-module-infra-server:
|
|
condition: service_healthy
|
|
|
|
viewsh-module-iot-gateway:
|
|
image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-iot-gateway:${IMAGE_TAG:-latest}
|
|
container_name: aiot-iot-gateway
|
|
restart: on-failure:5
|
|
ports:
|
|
- "1883:1883"
|
|
- "8092:8092"
|
|
- "8091:8091"
|
|
environment:
|
|
IOT_TCP_ENABLED: "true"
|
|
TZ: Asia/Shanghai
|
|
SPRING_PROFILES_ACTIVE: prod
|
|
JAVA_OPTS: "-Xms1024m -Xmx2048m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs"
|
|
|
|
SPRING_DATA_REDIS_HOST: 172.17.16.13
|
|
SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
|
|
|
|
ROCKETMQ_NAMESRV_ADDR: rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080
|
|
ROCKETMQ_ACCESS_KEY: ak4wd73bxpv55331e7c5b80
|
|
ROCKETMQ_SECRET_KEY: sk82108944bc0997f7
|
|
VIEWSH_IOT_GATEWAY_RPC_URL: "http://aiot-iot-server:48091"
|
|
volumes:
|
|
- app-logs:/app/logs
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
memory: 2560m
|
|
cpus: '1.5'
|
|
depends_on:
|
|
- viewsh-module-iot-server
|
|
|
|
viewsh-module-ops-server:
|
|
image: ${REGISTRY_HOST:-172.17.16.7:5000}/viewsh-module-ops-server:${IMAGE_TAG:-latest}
|
|
container_name: aiot-ops-server
|
|
restart: on-failure:5
|
|
ports:
|
|
- "48092:48092"
|
|
- "9904:9904"
|
|
environment:
|
|
TZ: Asia/Shanghai
|
|
SPRING_PROFILES_ACTIVE: prod
|
|
JAVA_OPTS: "-Xms512m -Xmx1024m -XX:+UseContainerSupport -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/app/logs"
|
|
|
|
NACOS_USERNAME: nacos
|
|
NACOS_PASSWORD: 9oDxX~}e7DeP
|
|
NACOS_ADDR: 172.17.16.7:8848
|
|
NACOS_DISCOVERY_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
NACOS_CONFIG_NAMESPACE: "8efd6d96-de7f-4664-b28e-c2788ffa1395"
|
|
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://172.17.16.8:3306/aiot-platform-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: root
|
|
SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: "tKi8rfUJjVrf@"
|
|
|
|
SPRING_DATA_REDIS_HOST: 172.17.16.13
|
|
SPRING_DATA_REDIS_PASSWORD: "HkVZkVnn1"
|
|
|
|
ROCKETMQ_NAMESRV_ADDR: rmq-4wd73bxpv.rocketmq.sh.qcloud.tencenttdmq.com:8080
|
|
ROCKETMQ_ACCESS_KEY: ak4wd73bxpv55331e7c5b80
|
|
ROCKETMQ_SECRET_KEY: sk82108944bc0997f7
|
|
|
|
# XXL-Job 调度中心地址
|
|
XXL_JOB_ADMIN_ADDRESSES: http://172.17.16.7:19090/xxl-job-admin
|
|
XXL_JOB_EXECUTOR_IP: 172.17.16.14
|
|
XXL_JOB_EXECUTOR_PORT: 9904
|
|
|
|
volumes:
|
|
- app-logs:/app/logs
|
|
healthcheck:
|
|
test: ["CMD", "curl", "-f", "http://localhost:48092/actuator/health"]
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 12
|
|
start_period: 120s
|
|
depends_on:
|
|
viewsh-module-iot-server:
|
|
condition: service_healthy
|