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
d05eb5cc48
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
# Conflicts:
# epmet-admin/epmet-admin-server/pom.xml
# epmet-gateway/pom.xml
# epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
# epmet-module/data-aggregator/data-aggregator-server/pom.xml
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/data-statistical/data-statistical-server/pom.xml
# epmet-module/epmet-common-service/common-service-server/pom.xml
# epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-heart/epmet-heart-server/pom.xml
# epmet-module/epmet-job/epmet-job-server/pom.xml
# epmet-module/epmet-oss/epmet-oss-server/pom.xml
# epmet-module/epmet-third/epmet-third-server/pom.xml
# epmet-module/gov-access/gov-access-server/pom.xml
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
# epmet-module/gov-org/gov-org-server/pom.xml
# epmet-module/gov-project/gov-project-server/pom.xml
# epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
# epmet-module/oper-customize/oper-customize-server/pom.xml
# epmet-module/resi-group/resi-group-server/pom.xml
# epmet-module/resi-home/resi-home-server/pom.xml
# epmet-module/resi-partymember/resi-partymember-server/pom.xml
# epmet-openapi/epmet-openapi-scan/pom.xml
# epmet-user/epmet-user-server/pom.xml
|
4 years ago |
| .. |
|
deploy
|
错误
|
4 years ago |
|
src/main
|
@ServletComponentScan注解指定basePackages的参数，个别服务的启动类太深，扫描不到common包中的filter
|
4 years ago |
|
Dockerfile
|
所有服务Dockerfile中的ENTRYPOINT启动命令增加exec参数
|
5 years ago |
|
pom.xml
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
|
4 years ago |
