fix: 修复健康检查和配置问题
- 修复健康检查 IP 地址 (172.17.16.14 -> localhost) - 禁用微信自动配置避免 appid 错误 - 添加服务依赖关系和启动顺序 - 优化 Jenkinsfile 部署流程 - 添加 Quartz 优雅关闭配置 - 注释 XXL-JOB Admin 配置（暂不部署）
This commit is contained in:
@@ -27,6 +27,7 @@ services:
|
||||
environment:
|
||||
JAVA_OPTS: "-Xms${GATEWAY_JVM_XMS} -Xmx${GATEWAY_JVM_XMX} ${JVM_COMMON_OPTS}"
|
||||
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE}
|
||||
SPRING_AUTOCONFIGURE_EXCLUDE: com.binarywang.spring.starter.wxjava.mp.config.WxMpServiceAutoConfiguration,com.binarywang.spring.starter.wxjava.mp.config.WxMpAutoConfiguration
|
||||
NACOS_SERVER_ADDR: ${NACOS_HOST}:${NACOS_PORT}
|
||||
REDIS_HOST: ${REDIS_HOST}
|
||||
REDIS_PORT: ${REDIS_PORT}
|
||||
@@ -41,11 +42,11 @@ services:
|
||||
memory: ${GATEWAY_MEMORY_LIMIT}
|
||||
cpus: '1.0'
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://172.17.16.14:48080/actuator/health"]
|
||||
interval: ${HEALTH_CHECK_INTERVAL}
|
||||
timeout: ${HEALTH_CHECK_TIMEOUT}
|
||||
retries: ${HEALTH_CHECK_RETRIES}
|
||||
start_period: ${HEALTH_CHECK_START_PERIOD}
|
||||
test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 5
|
||||
start_period: 90s
|
||||
|
||||
viewsh-module-system-server:
|
||||
image: ${REGISTRY_HOST}/viewsh-module-system-server:${IMAGE_TAG}
|
||||
@@ -55,6 +56,7 @@ services:
|
||||
environment:
|
||||
JAVA_OPTS: "-Xms${SYSTEM_JVM_XMS} -Xmx${SYSTEM_JVM_XMX} ${JVM_COMMON_OPTS}"
|
||||
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE}
|
||||
SPRING_AUTOCONFIGURE_EXCLUDE: com.binarywang.spring.starter.wxjava.mp.config.WxMpServiceAutoConfiguration
|
||||
NACOS_SERVER_ADDR: ${NACOS_HOST}:${NACOS_PORT}
|
||||
MYSQL_HOST: ${MYSQL_HOST}
|
||||
MYSQL_PORT: ${MYSQL_PORT}
|
||||
@@ -74,11 +76,14 @@ services:
|
||||
memory: ${SYSTEM_MEMORY_LIMIT}
|
||||
cpus: '1.0'
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://172.17.16.14:48081/actuator/health"]
|
||||
interval: ${HEALTH_CHECK_INTERVAL}
|
||||
timeout: ${HEALTH_CHECK_TIMEOUT}
|
||||
retries: ${HEALTH_CHECK_RETRIES}
|
||||
start_period: ${HEALTH_CHECK_START_PERIOD}
|
||||
test: ["CMD", "curl", "-f", "http://localhost:48081"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 5
|
||||
start_period: 90s
|
||||
depends_on:
|
||||
viewsh-gateway:
|
||||
condition: service_healthy
|
||||
|
||||
viewsh-module-infra-server:
|
||||
image: ${REGISTRY_HOST}/viewsh-module-infra-server:${IMAGE_TAG}
|
||||
@@ -88,6 +93,10 @@ services:
|
||||
environment:
|
||||
JAVA_OPTS: "-Xms${INFRA_JVM_XMS} -Xmx${INFRA_JVM_XMX} ${JVM_COMMON_OPTS}"
|
||||
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE}
|
||||
SPRING_AUTOCONFIGURE_EXCLUDE: com.binarywang.spring.starter.wxjava.mp.config.WxMpServiceAutoConfiguration
|
||||
# XXL-JOB 配置（暂时注释，等部署 XXL-JOB Admin 后启用）
|
||||
# XXL_JOB_ADMIN_ADDRESSES: ${XXL_JOB_ADMIN_ADDRESSES:-http://127.0.0.1:9090/xxl-job-admin}
|
||||
# XXL_JOB_ACCESS_TOKEN: ${XXL_JOB_ACCESS_TOKEN:-default_token}
|
||||
NACOS_SERVER_ADDR: ${NACOS_HOST}:${NACOS_PORT}
|
||||
MYSQL_HOST: ${MYSQL_HOST}
|
||||
MYSQL_PORT: ${MYSQL_PORT}
|
||||
@@ -107,11 +116,14 @@ services:
|
||||
memory: ${INFRA_MEMORY_LIMIT}
|
||||
cpus: '1.0'
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://172.17.16.14:48082/actuator/health"]
|
||||
interval: ${HEALTH_CHECK_INTERVAL}
|
||||
timeout: ${HEALTH_CHECK_TIMEOUT}
|
||||
retries: ${HEALTH_CHECK_RETRIES}
|
||||
start_period: ${HEALTH_CHECK_START_PERIOD}
|
||||
test: ["CMD", "curl", "-f", "http://localhost:48082"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 5
|
||||
start_period: 90s
|
||||
depends_on:
|
||||
viewsh-module-system-server:
|
||||
condition: service_healthy
|
||||
|
||||
viewsh-module-iot-server:
|
||||
image: ${REGISTRY_HOST}/viewsh-module-iot-server:${IMAGE_TAG}
|
||||
@@ -121,6 +133,7 @@ services:
|
||||
environment:
|
||||
JAVA_OPTS: "-Xms${IOT_SERVER_JVM_XMS} -Xmx${IOT_SERVER_JVM_XMX} ${JVM_COMMON_OPTS}"
|
||||
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE}
|
||||
SPRING_AUTOCONFIGURE_EXCLUDE: com.binarywang.spring.starter.wxjava.mp.config.WxMpServiceAutoConfiguration
|
||||
NACOS_SERVER_ADDR: ${NACOS_HOST}:${NACOS_PORT}
|
||||
MYSQL_HOST: ${MYSQL_HOST}
|
||||
MYSQL_PORT: ${MYSQL_PORT}
|
||||
@@ -141,11 +154,14 @@ services:
|
||||
memory: ${IOT_SERVER_MEMORY_LIMIT}
|
||||
cpus: '1.5'
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://172.17.16.14:48083/actuator/health"]
|
||||
interval: ${HEALTH_CHECK_INTERVAL}
|
||||
timeout: ${HEALTH_CHECK_TIMEOUT}
|
||||
retries: ${HEALTH_CHECK_RETRIES}
|
||||
start_period: ${HEALTH_CHECK_START_PERIOD}
|
||||
test: ["CMD", "curl", "-f", "http://localhost:48083"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 5
|
||||
start_period: 90s
|
||||
depends_on:
|
||||
viewsh-module-infra-server:
|
||||
condition: service_healthy
|
||||
|
||||
viewsh-module-iot-gateway:
|
||||
image: ${REGISTRY_HOST}/viewsh-module-iot-gateway:${IMAGE_TAG}
|
||||
@@ -155,6 +171,7 @@ services:
|
||||
environment:
|
||||
JAVA_OPTS: "-Xms${IOT_GATEWAY_JVM_XMS} -Xmx${IOT_GATEWAY_JVM_XMX} ${JVM_COMMON_OPTS}"
|
||||
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE}
|
||||
SPRING_AUTOCONFIGURE_EXCLUDE: com.binarywang.spring.starter.wxjava.mp.config.WxMpServiceAutoConfiguration
|
||||
# Nacos 配置
|
||||
NACOS_SERVER_ADDR: ${NACOS_HOST}:${NACOS_PORT}
|
||||
NACOS_USERNAME: ${NACOS_USERNAME}
|
||||
@@ -219,11 +236,14 @@ services:
|
||||
memory: ${IOT_GATEWAY_MEMORY_LIMIT}
|
||||
cpus: '1.5'
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://172.17.16.14:48084/actuator/health"]
|
||||
interval: ${HEALTH_CHECK_INTERVAL}
|
||||
timeout: ${HEALTH_CHECK_TIMEOUT}
|
||||
retries: ${HEALTH_CHECK_RETRIES}
|
||||
start_period: ${HEALTH_CHECK_START_PERIOD}
|
||||
test: ["CMD", "curl", "-f", "http://localhost:48084"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 5
|
||||
start_period: 90s
|
||||
depends_on:
|
||||
viewsh-module-iot-server:
|
||||
condition: service_healthy
|
||||
|
||||
viewsh-module-ops-server:
|
||||
image: ${REGISTRY_HOST}/viewsh-module-ops-server:${IMAGE_TAG}
|
||||
@@ -233,6 +253,7 @@ services:
|
||||
environment:
|
||||
JAVA_OPTS: "-Xms${OPS_JVM_XMS} -Xmx${OPS_JVM_XMX} ${JVM_COMMON_OPTS}"
|
||||
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE}
|
||||
SPRING_AUTOCONFIGURE_EXCLUDE: com.binarywang.spring.starter.wxjava.mp.config.WxMpServiceAutoConfiguration
|
||||
NACOS_SERVER_ADDR: ${NACOS_HOST}:${NACOS_PORT}
|
||||
MYSQL_HOST: ${MYSQL_HOST}
|
||||
MYSQL_PORT: ${MYSQL_PORT}
|
||||
@@ -251,8 +272,34 @@ services:
|
||||
memory: ${OPS_MEMORY_LIMIT}
|
||||
cpus: '0.5'
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://172.17.16.14:48085/actuator/health"]
|
||||
interval: ${HEALTH_CHECK_INTERVAL}
|
||||
timeout: ${HEALTH_CHECK_TIMEOUT}
|
||||
retries: ${HEALTH_CHECK_RETRIES}
|
||||
start_period: ${HEALTH_CHECK_START_PERIOD}
|
||||
test: ["CMD", "curl", "-f", "http://localhost:48085"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 5
|
||||
start_period: 90s
|
||||
depends_on:
|
||||
viewsh-module-infra-server:
|
||||
condition: service_healthy
|
||||
|
||||
# ============ XXL-JOB Admin (可选，暂时注释) ============
|
||||
# 如需部署 XXL-JOB Admin，取消以下注释
|
||||
# xxl-job-admin:
|
||||
# image: xuxueli/xxl-job-admin:2.4.0
|
||||
# container_name: aiot-xxl-job-admin
|
||||
# restart: unless-stopped
|
||||
# network_mode: host
|
||||
# environment:
|
||||
# TZ: ${TZ}
|
||||
# PARAMS: >
|
||||
# --spring.datasource.url=jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
|
||||
# --spring.datasource.username=${MYSQL_USER}
|
||||
# --spring.datasource.password=${MYSQL_PASSWORD}
|
||||
# --xxl.job.accessToken=${XXL_JOB_ACCESS_TOKEN:-default_token}
|
||||
# volumes:
|
||||
# - app-logs:/data/applogs
|
||||
# healthcheck:
|
||||
# test: ["CMD", "curl", "-f", "http://localhost:9090/xxl-job-admin"]
|
||||
# interval: 30s
|
||||
# timeout: 10s
|
||||
# retries: 5
|
||||
# start_period: 60s
|
||||
|
||||
Reference in New Issue
Block a user