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

application.yml

@@ -1,7 +1,9 @@
#log level
logging:
  level:
    org:
      apache: WARN
      apache:
        zookeeper: WARN
#set max http header size
server:

svr-ehr-basic.yml

@@ -55,6 +55,9 @@ spring:
      password: admin
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
@@ -62,7 +65,7 @@ fast-dfs:
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host:  http://172.19.103.68:9200
  host: http://172.19.103.68:9200
  tHost: 172.19.103.68:9300
  clusterName: jkzl
@@ -81,6 +84,9 @@ spring:
      password: admin
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
@@ -88,7 +94,7 @@ fast-dfs:
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host:  http://172.19.103.68:9200
  host: http://172.19.103.68:9200
  tHost: 172.19.103.68:9300
  clusterName: jkzl
@@ -107,7 +113,9 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
@@ -115,7 +123,7 @@ fast-dfs:
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host:  http://172.19.103.68:9200
  host: http://172.19.103.68:9200
  tHost: 172.19.103.68:9300
  clusterName: jkzl
@@ -134,7 +142,9 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://10.176.97.7:9200
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
@@ -142,7 +152,7 @@ fast-dfs:
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host:  http://10.176.97.7:9200
  host: http://10.176.97.7:9200
  tHost: 10.176.97.7:9300
  clusterName: jkzl
@@ -161,7 +171,9 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://100.100.1.158:9200
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
@@ -169,6 +181,6 @@ fast-dfs:
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host:  http://100.100.1.158:9200
  host: http://100.100.1.158:9200
  tHost: 100.100.1.158:9300
  clusterName: jkzl

svr-quota.yml

@@ -17,11 +17,14 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
    username: chenweishan
    password: chenweishan
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://172.19.103.9:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
@@ -31,15 +34,18 @@ spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
    username: chenweishan
    password: chenweishan
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://172.19.103.9:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
.
---
spring:
  profiles: prod_fz
@@ -50,6 +56,9 @@ spring:
  data:
    solr:
      zk-host: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://172.19.103.9:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
@@ -64,6 +73,9 @@ spring:
  data:
    solr:
      zk-host: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://10.176.97.7:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 10.176.97.7:9300
@@ -78,6 +90,9 @@ spring:
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://100.100.1.158:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 100.100.1.158:9300