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

ag-ehr-cloud.yml

@@ -102,7 +102,8 @@ spring:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm
  thymeleaf:
    cache: false
  metrics:
    export:
      statsd:
@@ -116,7 +117,8 @@ spring:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1
  thymeleaf:
    cache: false
  metrics:
    export:
      statsd:

application.yml

@@ -152,6 +152,6 @@ spring:
#else the server must have host map.
eureka:
  instance:
    prefer-ip-address: false
    prefer-ip-address: true
eureka-server-ip: 192.168.135.29:8761

svr-pack-mgr.yml

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

svr-pack-resolve.yml

@@ -279,4 +279,4 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    - hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com

svr-quota.yml

@@ -69,4 +69,4 @@ spring:
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr # ZooKeeper host address in the form HOST:PORT.

svr-redis.yml

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

svr-resource.yml

@@ -115,7 +115,7 @@ spring:
      zk-host: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    - hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
fast-dfs:
  tracker-server: 192.168.135.42:22122

svr-standard.yml

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