Merge branch 'dev' of http://192.168.1.220:10080/EHR/ehr.config into dev

Conflicts:
	svr-resource.yml
	svr-standard.yml

svr-resource.yml

@@ -24,87 +24,61 @@ spring:
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # Redis server host.
  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.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com
    #- hbase.zookeeper.quorum: node1,node2,node3
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # Redis server host.
  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.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com
    #- hbase.zookeeper.quorum: node1,node2,node3
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: weifuwu
    password: weifuwu
    username: yuhaihua
    password: yuhaihua
  redis:
    host: 172.19.103.47 # Redis server host.
  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.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com
    #- hbase.zookeeper.quorum: node1,node2,node3
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm
  redis:
    host: 11.1.2.20 # Redis server host.
  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.
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com

svr-standard.yml

@@ -98,10 +98,13 @@ spring:
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
    username: weifuwu
    password: weifuwu
    #username: chenweishan
    #password: chenweishan
  redis:
    #host: 172.17.110.193
    host: 172.19.103.47 # Redis server host.
fast-dfs: