Merge branch 'dev' of EHR/ehr.config into master

svr-pack-mgr.yml

@@ -138,7 +138,7 @@ spring:
  redis:
    host: 192.168.135.40 # Redis server host.
    port: 6390
    password: redis!@#456
    password: redis!@456
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122

svr-pack-resolve.yml

@@ -262,6 +262,7 @@ spring:
  redis:
    host: 192.168.135.40 # Redis server host.
    port: 6390
    password: redis!@456
  data:
    solr:

svr-redis.yml

@@ -132,7 +132,7 @@ spring:
    host: 192.168.135.40 # Redis server host.
    port: 6390
    # Login password of the redis server.
    password: redis!@#456
    password: redis!@456
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122

svr-resource.yml

@@ -108,7 +108,7 @@ spring:
  redis:
    host: 192.168.135.40 # Redis server host.
    port: 6390
    password: redis!@#456
    password: redis!@456
  data:
    solr:
      #zk-host: 11.1.2.51,11.1.2.52,11.1.2.53:2181/solr # ZooKeeper host address in the form HOST:PORT.

svr-standard.yml

@@ -136,7 +136,7 @@ spring:
  redis:
    host: 192.168.135.40 # Redis server host.
    port: 6390
    password: redis!@#456
    password: redis!@456
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122