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

ag-zuul.yml

@@ -0,0 +1,65 @@
server:
  port: ${ag-zuul.server.port}
management:
  port: ${server.port}
info:
  app:
    name: Ag-Zuul
    description:  EHR Platform Zuul Service.
    version: 1.0.0
zuul:
  routes:
    svr-dfs:
      path: /svr-dfs/**
      serviceId: svr-dfs
    svr-ehr-basic:
      path: /svr-ehr-basic/**
      serviceId: svr-ehr-basic
    svr-health-profile:
      path: /svr-health-profile/**
      serviceId: svr-health-profile
    svr-pack-mgr:
      path: /svr-pack-mgr/**
      serviceId: svr-pack-mgr
    svr-pack-resolv:
      path: /svr-pack-resolve/**
      serviceId: svr-pack-resolve
    svr-quota:
      path: /svr-quota/**
      serviceId: svr-quota
    svr-redis:
      path: /svr-redis/**
      serivceId: svr-redis
    svr-resource:
      path: /svr-resource/**
      serviceId: svr-resource
    svr-standard:
      path: /svr-standard/**
      serviceId: svr-standard
---
spring:
  profiles: dev
---
spring:
  profiles: alpha
---
spring:
  profiles: test
---
spring:
  profiles: prod
---
spring:
  profiles: prod_fz
---
spring:
  profiles: prod_sr

application.yml

@@ -30,6 +30,7 @@ ag-ehr-platform.server.port: 443
ag-ehr-cloud.server.port: 10400
ag-portal-cloud.server.port: 10280
ag-admin.server.port: 10000
ag-zuul.server.port: 10001
svr-adaption.server.port: 10150
svr-app.server.port: 10160
svr-dict.server.port: 10050
@@ -55,6 +56,7 @@ svr-portal.server.port: 10250
svr-file-resource.server.port: 10270
svr-ehr-basic.server.port: 10300
svr-redis.server.port: 10310
svr-redis-memory.server.port: 10311
svr-log-collection.server.port: 10320
svr-quota.server.port: 10330
svr-dfs.server.port: 10770

svr-dfs.yml

@@ -4,6 +4,9 @@ logging:
      springframework:
        web: INFO
      hibernate: ERROR
    com:
      yihu:
        ehr: WARN
server:
  port: ${svr-dfs.server.port}
@@ -35,6 +38,15 @@ fast-dfs:
    name: dfs #ES索引名称
    type: info #ES索引类型
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 5
    max-idle: 2
    min-idle: 2
    validation-query: SELECT 1
    test-on-borrow: true
elasticsearch:
  pool:
    init-size: 5
@@ -43,53 +55,83 @@ elasticsearch:
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
---
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql:///10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 11.1.2.9:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://10.176.97.5:8888

svr-redis-memory.yml

@@ -0,0 +1,150 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    timeout: 0 # Connection timeout in milliseconds.
    #sentinel:
    #  master: # Name of Redis server.
    #  nodes: # Comma-separated list of host:port pairs.
    pool:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      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.
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 20
    max-idle: 8
    min-idle: 8
    validation-query: SELECT 1
    test-on-borrow: true
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
  redis:
    host: 172.19.103.47
    port: 6379
    password: redis!@456
ehr-redis:
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # Redis server host.
ehr-redis:
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
ehr-redis:
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv
---
spring:
  profiles: prod
  redis:
    host: 11.1.2.20 # Redis server host.
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
ehr-redis:
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv
---
spring:
  profiles: prod_fz
  datasource:
    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
    port: 6390
    password: Kb6wKDQP1W4
ehr-redis:
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv
---
spring:
  profiles: prod_sr
  redis:
    host: 10.176.97.5
    port: 6390
    password: q4YaQemf
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
ehr-redis:
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv

svr-redis.yml

@@ -70,17 +70,6 @@ ehr-redis:
    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
---
@@ -105,15 +94,6 @@ ehr-redis:
    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
---
@@ -138,15 +118,6 @@ ehr-redis:
    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
---
@@ -170,15 +141,6 @@ ehr-redis:
    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
---
@@ -202,15 +164,6 @@ ehr-redis:
    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
---
@@ -233,13 +186,4 @@ 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
      responseTimeChannel: redis.cache.reponse-time