Merge branch 'dev' of hill9868/ehr.config into dev

svr-health-profile-search.yml

@@ -65,5 +65,5 @@ spring:
  data:
    solr:
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.

svr-health-profile.yml

@@ -159,8 +159,8 @@ spring:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    #- hbase.zookeeper.quorum: node1,node2,node3
    #- hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    - hbase.zookeeper.quorum: node1,node2,node3
fast-dfs:
  tracker-server: 11.1.2.9:22122

svr-pack-resolve.yml

@@ -182,7 +182,7 @@ spring:
  data:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: 11.1.2.51,11.1.2.52,11.1.2.53:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
@@ -196,4 +196,5 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    #- hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    - hbase.zookeeper.quorum: node1,node2,node3

svr-profile-statistics.yml

@@ -124,8 +124,8 @@ spring:
  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.
      #zk-host: 11.1.2.51,11.1.2.52,11.1.2.53:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1,node2,node3:2181/solr
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha