You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
jianjun
296addb0d0
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
# Conflicts:
# epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
# epmet-auth/deploy/docker-compose-prod.yml
# epmet-gateway/deploy/docker-compose-prod.yml
# epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
# epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
# epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
# epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
# epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
# epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
# epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
# epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml
# epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
# epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
# epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
# epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
# epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
# epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
# epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
# epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
# epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
# epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
# epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
# epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
|
3 years ago |
.. |
docker-compose-dev.yml
|
将130相关的配置替换为140
|
4 years ago |
docker-compose-prod.yml
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
|
3 years ago |
docker-compose-test.yml
|
修改配置,适配市北测试环境
|
4 years ago |