fix(docker-compose): add SPRING_DATASOURCE/REDIS overrides to all services
im-service, push-service, update-service, license-service were missing the SPRING_DATASOURCE_URL/USERNAME/PASSWORD environment overrides that tenant-service and file-service already had. Without these, all services connected to the hardcoded production database (39.107.53.187) instead of the local private MySQL, causing mutations in the private deployment to affect the public platform. im-service also gets SPRING_DATA_REDIS_* overrides to replace the hardcoded redisdev.xuqinmin.com Redis connection. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
这个提交包含在:
父节点
d2599a0c1e
当前提交
e5ffde39a0
@ -109,7 +109,13 @@ services:
|
|||||||
- ./config/xuqm.env
|
- ./config/xuqm.env
|
||||||
- ./config/secrets.env
|
- ./config/secrets.env
|
||||||
environment:
|
environment:
|
||||||
# im-service 默认调用 127.0.0.1:9001,必须覆盖为 Docker 服务名
|
SPRING_DATASOURCE_URL: "jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT:-3306}/${MYSQL_DATABASE:-xuqm_private}?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true"
|
||||||
|
SPRING_DATASOURCE_USERNAME: "${MYSQL_USERNAME:-xuqm}"
|
||||||
|
SPRING_DATASOURCE_PASSWORD: "${MYSQL_PASSWORD}"
|
||||||
|
SPRING_DATA_REDIS_HOST: "${REDIS_HOST}"
|
||||||
|
SPRING_DATA_REDIS_PORT: "${REDIS_PORT:-6379}"
|
||||||
|
SPRING_DATA_REDIS_PASSWORD: "${REDIS_PASSWORD}"
|
||||||
|
SPRING_DATA_REDIS_DATABASE: "${REDIS_DATABASE:-0}"
|
||||||
TENANT_SERVICE_URL: "http://tenant-service:9001"
|
TENANT_SERVICE_URL: "http://tenant-service:9001"
|
||||||
PUSH_SERVICE_URL: "http://push-service:8083"
|
PUSH_SERVICE_URL: "http://push-service:8083"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -126,6 +132,10 @@ services:
|
|||||||
- ./config/xuqm.env
|
- ./config/xuqm.env
|
||||||
- ./config/secrets.env
|
- ./config/secrets.env
|
||||||
- ./config/vendors/push.env # 各厂商推送凭据
|
- ./config/vendors/push.env # 各厂商推送凭据
|
||||||
|
environment:
|
||||||
|
SPRING_DATASOURCE_URL: "jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT:-3306}/${MYSQL_DATABASE:-xuqm_private}?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true"
|
||||||
|
SPRING_DATASOURCE_USERNAME: "${MYSQL_USERNAME:-xuqm}"
|
||||||
|
SPRING_DATASOURCE_PASSWORD: "${MYSQL_PASSWORD}"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@ -141,7 +151,9 @@ services:
|
|||||||
- ./config/secrets.env
|
- ./config/secrets.env
|
||||||
- ./config/vendors/store-submit.env # 各应用市场发布凭据
|
- ./config/vendors/store-submit.env # 各应用市场发布凭据
|
||||||
environment:
|
environment:
|
||||||
# update-service 默认调用 xuqm-tenant-service:9001(不可解析),需覆盖
|
SPRING_DATASOURCE_URL: "jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT:-3306}/${MYSQL_DATABASE:-xuqm_private}?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true"
|
||||||
|
SPRING_DATASOURCE_USERNAME: "${MYSQL_USERNAME:-xuqm}"
|
||||||
|
SPRING_DATASOURCE_PASSWORD: "${MYSQL_PASSWORD}"
|
||||||
SDK_TENANT_SERVICE_URL: "http://tenant-service:9001"
|
SDK_TENANT_SERVICE_URL: "http://tenant-service:9001"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/update:/data/update # 版本包存储目录
|
- ./data/update:/data/update # 版本包存储目录
|
||||||
@ -158,4 +170,8 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- ./config/xuqm.env
|
- ./config/xuqm.env
|
||||||
- ./config/secrets.env
|
- ./config/secrets.env
|
||||||
|
environment:
|
||||||
|
SPRING_DATASOURCE_URL: "jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT:-3306}/${MYSQL_DATABASE:-xuqm_private}?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true"
|
||||||
|
SPRING_DATASOURCE_USERNAME: "${MYSQL_USERNAME:-xuqm}"
|
||||||
|
SPRING_DATASOURCE_PASSWORD: "${MYSQL_PASSWORD}"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|||||||
正在加载...
在新工单中引用
屏蔽一个用户