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

ag-ehr-cloud.yml

@@ -122,15 +122,15 @@ eip:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: sr_healtharchive
    password: data!@)1
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  thymeleaf:
    cache: false
  metrics:
    export:
      statsd:
        host: 192.168.135.29
        host: 11.1.2.5
        port: 8125
eip:
  tenant: jkzl

application.yml

@@ -57,6 +57,7 @@ svr-ehr-basic.server.port: 10300
svr-redis.server.port: 10310
svr-log-collection.server.port: 10320
svr-quota.server.port: 10330
svr-dfs.server.port: 10770
#Application acuator
endpoints:
  restart:
@@ -154,7 +155,7 @@ eureka:
  instance:
    prefer-ip-address: true
eureka-server-ip: 192.168.135.29:8761
eureka-server-ip: 11.1.2.1:8761
---

svr-dfs.yml

@@ -0,0 +1,95 @@
logging:
  level:
    org:
      springframework:
        web: INFO
      hibernate: ERROR
server:
  port: ${svr-dfs.server.port}
management:
  port: ${server.port}
info:
  app:
    name: svr-dfs
    description: Ehr Platform Distributed File System Service.
    version: 1.0.0
fast-dfs:
  connect-timeout: 2
  network-timeout: 30
  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
  server:
    dict-code: FASTDFSWLDZ #外链地址系统字典拼音编码
  index:
    name: dfs #ES索引名称
    type: info #ES索引类型
elasticsearch:
  pool:
    init-size: 5
    max-size: 10
---
spring:
  profiles: dev
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 172.19.103.13:22122
---
spring:
  profiles: alpha
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 172.19.103.54:22122
---
spring:
  profiles: test
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 172.19.103.13:22122
---
spring:
  profiles: prod
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 11.1.2.9:22122
---
spring:
  profiles: prod_fz
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 11.1.2.9:22122
---
spring:
  profiles: prod_sr
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 11.1.2.9:22122

svr-ehr-basic.yml

@@ -124,21 +124,21 @@ eip:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: sr_healtharchive
    password: data!@)1
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  data:
    mongodb:
      host: 192.168.135.41
      port: 29000
      username: sr_ehr
      password: ehr@#(2^
      host: 11.1.2.19
      port: 20000
      username: jkzlehr
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl

svr-health-profile.yml

@@ -135,14 +135,18 @@ eip:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: sr_healtharchive
    password: data!@)1
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 11.1.2.22 # Redis server host.
    port: 6390
    password: Kb6wKDQP1W4
  application:
    id: JKZL
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl

svr-logCollection.yml

@@ -47,14 +47,13 @@ spring:
  profiles: prod_fz
  data:
    mongodb:
      host: 192.168.135.41
      host: 10.176.97.9
      port: 29000
      username: sr_ehr
      password: ehr@#(2^
      username: jkzlehr
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
---
spring:
  profiles: prod_sr

svr-pack-mgr.yml

@@ -141,16 +141,16 @@ eip:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: sr_healtharchive
    password: data!@)1
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 192.168.135.40 # Redis server host.
    host: 11.1.2.22 # Redis server host.
    port: 6390
    password: redis!@456
    password: Kb6wKDQP1W4
fast-dfs:
  tracker-server: 192.168.135.25:22122
  public-server: http://192.168.25.42:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl

svr-pack-resolve.yml

@@ -263,17 +263,17 @@ hadoop:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: sr_healtharchive
    password: data!@)1
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 192.168.135.40 # Redis server host.
    host: 11.1.2.22 # Redis server host.
    port: 6390
    password: redis!@456
    password: Kb6wKDQP1W4
  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.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
@@ -282,12 +282,12 @@ spring:
        port: 8125
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
    - hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
---

svr-quota.yml

@@ -63,13 +63,13 @@ spring:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: sr_healtharchive
    password: data!@)1
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  data:
    solr:
      zk-host: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
---
spring:

svr-redis.yml

@@ -60,12 +60,29 @@ spring:
    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:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /usr/local/ehr/redisReport/memory.csv
# 由于生产环境服务器维护通过堡垒机管理，不允许代码直接通过SSH访问远程服务器。
# 暂时注释，寻求别的方法再去掉。
#  server:
#    host: 172.19.103.47
#    username: root
#    password: jkzl
#    ssh-port: 22
---
spring:
  profiles: alpha
@@ -83,6 +100,20 @@ fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /usr/local/ehr/redisReport/memory.csv
#  server:
#    host: 172.19.103.47
#    username: root
#    password: jkzl
#    ssh-port: 22
---
@@ -102,6 +133,20 @@ fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /usr/local/ehr/redisReport/memory.csv
#  server:
#    host: 172.19.103.47
#    username: root
#    password: jkzl
#    ssh-port: 22
---
@@ -120,23 +165,52 @@ fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /usr/local/ehr/redisReport/memory.csv
#  server:
#    host: 172.19.103.47
#    username: root
#    password: jkzl
#    ssh-port: 22
---
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: sr_healtharchive
    password: data!@)1
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 192.168.135.40 # Redis server host.
    host: 11.1.2.22 # Redis server host.
    port: 6390
    # Login password of the redis server.
    password: redis!@456
    password: Kb6wKDQP1W4
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /usr/local/ehr/redisReport/memory.csv
#  server:
#    host: 172.19.103.47
#    username: root
#    password: jkzl
#    ssh-port: 22
---
@@ -153,4 +227,19 @@ spring:
    password: q4YaQemf
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
  public-server: http://10.176.97.5:8888
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /usr/local/ehr/redisReport/memory.csv
#  server:
#    host: 172.19.103.47
#    username: root
#    password: jkzl
#    ssh-port: 22

svr-resource.yml

@@ -114,24 +114,24 @@ eip:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: sr_healtharchive
    password: data!@)1
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 192.168.135.40 # Redis server host.
    host: 11.1.2.22 # Redis server host.
    port: 6390
    password: redis!@456
    password: Kb6wKDQP1W4
  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: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr
      zk-host: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com:2181/solr
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
    - hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl

svr-standard.yml

@@ -136,16 +136,16 @@ eip:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: sr_healtharchive
    password: data!@)1
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 192.168.135.40 # Redis server host.
    host: 11.1.2.22 # Redis server host.
    port: 6390
    password: redis!@456
    password: Kb6wKDQP1W4
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl