diff --git a/docker-compose.yml b/docker-compose.yml index a4dc3c8..48d0600 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -109,7 +109,13 @@ services: - ./config/xuqm.env - ./config/secrets.env 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" PUSH_SERVICE_URL: "http://push-service:8083" restart: unless-stopped @@ -126,6 +132,10 @@ services: - ./config/xuqm.env - ./config/secrets.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 # --------------------------------------------------------------------------- @@ -141,7 +151,9 @@ services: - ./config/secrets.env - ./config/vendors/store-submit.env # 各应用市场发布凭据 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" volumes: - ./data/update:/data/update # 版本包存储目录 @@ -158,4 +170,8 @@ services: env_file: - ./config/xuqm.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