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

ag-zuul.yml

@@ -38,7 +38,7 @@ zuul:
    # 卫计委官网
    gov-server:
      path: /open/govServer/**
      url: http://www.srswjw.gov.cn:8080/
      url: http://www.srswjw.gov.cn/
    # 应急指挥
    emergency-server:
      path: /open/baidu/**
@@ -67,7 +67,7 @@ zuul:
    # 卫计委官网
    gov-server:
      path: /open/govServer/**
      url: http://www.srswjw.gov.cn:8080/
      url: http://www.srswjw.gov.cn/
    # 应急指挥
    emergency-server:
      path: /open/baidu/**

svr-pack-analyzer.yml

@@ -87,6 +87,9 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52