merge code

svr-pack-resolve.yml

@@ -171,6 +171,12 @@ spring:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
      statsd:
        host: localhost
        port: 8125
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122