Merge remote-tracking branch 'origin/dev' into dev

application.yml

@@ -40,6 +40,7 @@ svr-health-profile.server.port: 9009
svr-organization.server.port: 10070
svr-pack-mgr.server.port: 10140
svr-pack-resolve.server.port: 10170
svr-pack-analyzer.server.port: 10340
svr-patient.server.port: 10100
svr-security.server.port: 10110
svr-special-dict.server.port: 10180

svr-dfs.yml

@@ -57,8 +57,8 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300