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

application.yml

@@ -38,6 +38,15 @@ hystrix:
ribbon:
  ReadTimeout: 300000
  ConnectTimeout: 5000
  
#Zuul
zuul:
  #max:
  #  host:
  #    connections: 500
  host:
    socket-timeout-millis: 300000
    connect-timeout-millis: 300000
#Application error definition, this file define common errors,
#if the error is used only in your application, please define it in your application configuration file.

svr-dfs.yml

@@ -8,8 +8,9 @@ spring:
    test-on-borrow: true
fast-dfs:
  connect-timeout: 2
  network-timeout: 30
  connect-timeout: 10
  network-timeout: 60
  charset: ISO8859-1
  pool:
    init-size: 5
@@ -19,6 +20,7 @@ fast-dfs:
    tracker-http-port: 80
    anti-steal-token: no
    secret-key: FastDFS1234567890
  server:
    dict-code: FASTDFSWLDZ #外链地址系统字典拼音编码
  index:
@@ -53,7 +55,7 @@ spring:
    password: weifuwu
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
  cluster-nodes: 172.19.103.9:9300
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
@@ -67,7 +69,7 @@ spring:
    password: jkzlxm
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
  cluster-nodes: 11.1.2.7:9300
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
@@ -95,7 +97,7 @@ spring:
    password: GP8Qz4qU
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
  cluster-nodes: 10.176.97.7:9300
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888

svr-ehr-basic.yml

@@ -2,13 +2,13 @@ management:
  port: ${server.port}
fast-dfs:
  connect-timeout: 10
  network-timeout: 60
  charset: ISO8859-1
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  connect-timeout: 2
  network-timeout: 30
  charset: ISO8859-1
  http:
    tracker-http-port: 80
    anti-steal-token: no

svr-health-profile.yml

@@ -22,13 +22,13 @@ spring:
    id: JKZL
fast-dfs:
  connect-timeout: 10
  network-timeout: 60
  charset: ISO8859-1
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  connect-timeout: 2
  network-timeout: 30
  charset: ISO8859-1
  http:
    tracker-http-port: 80
    anti-steal-token: no

svr-pack-analyzer.yml

@@ -23,19 +23,15 @@ spring:
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
  # SOLR (SolrProperties)
  data:
    solr:
      repositories.enabled: true # Enable Solr repositories.
fast-dfs:
  connect-timeout: 10
  network-timeout: 60
  charset: ISO8859-1
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  connect-timeout: 2
  network-timeout: 30
  charset: ISO8859-1
  http:
    tracker-http-port: 80
    anti-steal-token: no
@@ -65,14 +61,6 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
      statsd:
        host: 172.19.103.73
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52
@@ -94,14 +82,6 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
      statsd:
        host: 172.19.103.73
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52
@@ -123,20 +103,12 @@ spring:
    host: 11.1.2.22 # Redis server host.
    port: 6390
    password: Kb6wKDQP1W4
  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.
  metrics:
    export:
      statsd:
        host: localhost
        port: 8125
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
  cluster-nodes: 11.1.2.7:9300
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
@@ -152,16 +124,6 @@ spring:
    host: 10.176.97.5 # Redis server host.
    port: 6390
    password: q4YaQemf
  data:
    solr:
      #host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.hde.jkzlehr.com,node2.hde.jkzlehr.com,node3.hde.jkzlehr.com:2181/solr
  metrics:
    export:
      statsd:
        host: localhost
        port: 8125
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
@@ -184,16 +146,6 @@ spring:
    host: 100.100.1.161 # Redis server host.
    port: 6390
    password: q4YaQemf
  data:
    solr:
      #host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      #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,node3.hde.h3c.com,node4.hde.h3c.com:2181/solr
  metrics:
    export:
      statsd:
        host: localhost
        port: 8125
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
@@ -216,14 +168,6 @@ spring:
    host: 192.168.50.82 # Redis server host.
    port: 6379
    password: q4YaQemf
  data:
    solr:
      zk-host: node1.jkzl.com,node2.jkzl.com,node4.jkzl.com:2181/solr
  metrics:
    export:
      statsd:
        host: localhost
        port: 8125
fast-dfs:
  tracker-server: 192.168.50.116:22122,192.168.50.119:22122
  public-server: http://192.168.50.37:8888

svr-pack-mgr.yml

@@ -1,16 +1,3 @@
fast-dfs:
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  connect-timeout: 2
  network-timeout: 30
  charset: ISO8859-1
  http:
    tracker-http-port: 80
    anti-steal-token: no
    secret-key: FastDFS1234567890
spring:
  # REDIS
  redis:
@@ -46,14 +33,12 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
---
spring:
@@ -66,14 +51,12 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
---
spring:
@@ -89,6 +72,9 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 11.1.2.7:9300
---
spring:
@@ -104,6 +90,9 @@ spring:
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 10.176.97.7:9300
---
spring:
@@ -119,6 +108,9 @@ spring:
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 100.100.1.158:9300
---
spring:
@@ -133,4 +125,7 @@ spring:
    password: q4YaQemf
fast-dfs:
  tracker-server: 192.168.50.116:22122,192.168.50.119:22122
  public-server: http://192.168.50.37:8888
  public-server: http://192.168.50.37:8888
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.10.10.2:9300

svr-pack-resolve.yml

@@ -20,23 +20,6 @@ spring:
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
  # SOLR (SolrProperties)
  data:
    solr:
      repositories.enabled: true # Enable Solr repositories.
fast-dfs:
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  connect-timeout: 2
  network-timeout: 30
  charset: ISO8859-1
  http:
    tracker-http-port: 80
    anti-steal-token: no
    secret-key: FastDFS1234567890
hadoop:
  hbase-properties:
@@ -63,22 +46,15 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
      statsd:
        host: 172.19.103.73
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
---
spring:
@@ -92,22 +68,15 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
      statsd:
        host: 172.19.103.73
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
---
spring:
@@ -120,22 +89,15 @@ spring:
    host: 11.1.2.22 # Redis server host.
    port: 6390
    password: Kb6wKDQP1W4
  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.
  metrics:
    export:
      statsd:
        host: 192.168.135.29
        port: 8125
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 11.1.2.7:9300
---
spring:
@@ -148,20 +110,15 @@ spring:
    host: 10.176.97.5 # Redis server host.
    port: 6390
    password: q4YaQemf
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
      statsd:
        host: 10.176.97.10
        port: 8125
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 10.176.97.7:9300
---
spring:
@@ -174,20 +131,15 @@ spring:
    host: 100.100.1.161 # Redis server host.
    port: 6390
    password: q4YaQemf
  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.
  metrics:
    export:
      statsd:
        host: 100.100.1.162
        port: 8125
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 100.100.1.158:9300
---
spring:
@@ -200,17 +152,12 @@ spring:
    host: 192.168.50.82 # Redis server host.
    port: 6379
    password: q4YaQemf
  data:
    solr:
      zk-host: node1.jkzl.com,node2.jkzl.com,node4.jkzl.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
      statsd:
        host: localhost
        port: 8125
fast-dfs:
  tracker-server: 192.168.50.116:22122,192.168.50.119:22122
  public-server: http://192.168.50.37:8888
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node4.jkzl.com
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.10.10.2:9300

svr-redis.yml

@@ -20,19 +20,6 @@ spring:
    validation-query: SELECT 1
    test-on-borrow: true
fast-dfs:
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  connect-timeout: 2
  network-timeout: 30
  charset: ISO8859-1
  http:
    tracker-http-port: 80
    anti-steal-token: no
    secret-key: FastDFS1234567890
---
spring:
  profiles: dev
@@ -44,10 +31,6 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  password: ha
ehr-redis:
  mq:
    pubsub:
@@ -65,10 +48,6 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  password: ha
ehr-redis:
  mq:
    pubsub:
@@ -86,9 +65,6 @@ spring:
    host: 11.1.2.22 # Redis server host.
    port: 6390
    password: Kb6wKDQP1W4
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
ehr-redis:
  mq:
    pubsub:
@@ -106,9 +82,6 @@ spring:
    host: 10.176.97.5 # Redis server host.
    port: 6390
    password: q4YaQemf
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
ehr-redis:
  mq:
    pubsub:
@@ -126,9 +99,6 @@ spring:
    host: 100.100.1.161 # Redis server host.
    port: 6390
    password: q4YaQemf
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
ehr-redis:
  mq:
    pubsub:
@@ -146,9 +116,6 @@ spring:
    host: 192.168.50.82 # Redis server host.
    port: 6379
    password: q4YaQemf
fast-dfs:
  tracker-server: 192.168.50.116:22122,192.168.50.119:22122
  public-server: http://192.168.50.37:8888
ehr-redis:
  mq:
    pubsub:

svr-resource.yml

@@ -23,6 +23,19 @@ spring:
    validation-query: SELECT 1
    test-on-borrow: true
fast-dfs:
  connect-timeout: 10
  network-timeout: 60
  charset: ISO8859-1
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  http:
    tracker-http-port: 80
    anti-steal-token: no
    secret-key: FastDFS1234567890
eip:
  tenant: jkzl
@@ -46,6 +59,9 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
---
spring:
@@ -67,6 +83,9 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
---
spring:
@@ -89,6 +108,9 @@ hadoop:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 11.1.2.7:9300
---
spring:
@@ -111,6 +133,9 @@ hadoop:
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 10.176.97.7:9300
---
spring:
@@ -133,6 +158,9 @@ hadoop:
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 100.100.1.158:9300
---
spring:
@@ -154,3 +182,6 @@ hadoop:
fast-dfs:
  tracker-server: 192.168.50.116:22122,192.168.50.119:22122
  public-server: http://192.168.50.37:8888
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.10.10.2:9300