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

application.yml

@@ -1,3 +1,35 @@
#The region code, where application deployed
deploy:
  region: 3502
#EHR platform user default password
default:
  password: 123456
redis-key-schema:
  std:
    version-table-prefix: std_cda_versions
    version-name: name
    data-set-table-prefix: std_data_set_
    data-set-code: code
    data-set-name: name
    meta-data-table-prefix: std_meta_data_
    meta-data-dict-id: dict_id
    meta-data-type: type
    dict-entry-table-prefix: std_dictionary_entry_
    dict-entry-value: value
  org:
    table: organizations
    name: name
#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.
ehr.common.invalid.parameter: 参数解析错误
ehr.common.query.not.found: 不存在该对象
ehr.common.repeat.code: 代码重复
#Application port, since 10100, 10 per step. Update max port if new application created. Current max: 10190
svr-adaption.server.port: 10150
@@ -5,7 +37,7 @@ svr-app.server.port: 10160
svr-dict.server.port: 10050
svr-esb.server.port: 10130
svr-geography.server.port: 10090
svr-health-profiles.server.port: 9009
svr-health-profile.server.port: 9009
svr-organization.server.port: 10070
svr-pack-mgr.server.port: 10140
svr-pack-resolve.server.port: 10170
@@ -18,20 +50,6 @@ ag-ehr-platform.server.port: 443
ag-admin.server.port: 10000
svr-family.server.port: 10190
#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.
ehr.common.invalid.parameter: 参数解析错误
ehr.common.query.not.found: 不存在该对象
ehr.common.repeat.code: 代码重复
#The region code, where application deployed
deploy:
  region: 3502
#EHR platform user default password
default:
  password: 123456
#Application acuator
endpoints:
  restart:
@@ -41,11 +59,12 @@ endpoints:
  health:
    sensitive: false
#JPA config for MySQL
spring:
  #JPA config for MySQL
  jpa:
    database-platform: org.hibernate.dialect.MySQL5Dialect
    hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
    show-sql: true
  #block the inet address of nic, virtual card and so on. Need spring version: Brixton M5
  cloud:

svr-app.yml

@@ -1,7 +1,7 @@
logging:
  level:
    com:
      netflix: DEBUG
      netflix: ERROR
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver

svr-dict.yml

@@ -1,7 +1,7 @@
logging:
  level:
    com:
      netflix: DEBUG
      netflix: ERROR
data-source:
  driver-class-name: com.mysql.jdbc.Driver

svr-esb.yml

@@ -1,7 +1,7 @@
logging:
  level:
    com:
      netflix: DEBUG
      netflix: ERROR
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver

svr-geography.yml

@@ -1,7 +1,7 @@
logging:
  level:
    com:
      netflix: DEBUG
      netflix: ERROR
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver

svr-health-profiles.yml

@@ -13,11 +13,15 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
hadoop:
  hbase-properties:
    - hbase.zookeeper.property.clientPort: 2181
    - zookeeper.znode.parent: /hbase-unsecure
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    host: localhost # Redis server host.
    port: 6379 # Redis server port.
    password: # Login password of the redis server.
    timeout: 0 # Connection timeout in milliseconds.
@@ -36,39 +40,74 @@ spring:
    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
# CDA类目关键数据集，以此判断CDA文档
cda-document:
  primary-data-set:
    - HDSC01_02: 0dae000656721083269e0319806c0f22
    - HDSC02_09: 0dae0006567210a6269e0319806c0f24
---
spring:
  profiles: dev
  redis:
    host: 172.19.103.47 # Redis server host.
    host: 192.168.1.220 # Redis server host.
  data:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
      host: http://172.19.103.68:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
fast-dfs:
  tracker-server: 172.19.103.54:22122
---
spring:
  profiles: test
  redis:
    host: 172.17.110.68 # Redis server host.
    host: 172.19.103.47 # Redis server host.
  data:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
      host: http://172.19.103.68:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
  user-name: yuhaihua
  password: yuhaihua
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
---
spring:
@@ -79,10 +118,17 @@ spring:
  data:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
      host: http://172.19.103.68:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  user-name: ha
  password: jkzlxm
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
fast-dfs:
  tracker-server: 11.1.2.9:22122

svr-org.yml

@@ -1,7 +1,24 @@
logging:
  level:
    com:
      netflix: DEBUG
      netflix: ERROR
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    password: # Login password of the redis server.
    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.
data-source:
  driver-class-name: com.mysql.jdbc.Driver
@@ -17,6 +34,9 @@ data-source:
spring:
  profiles: dev
  redis:
    host: 192.168.1.220 # Redis server host.
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
@@ -26,6 +46,9 @@ data-source:
spring:
  profiles: test
  redis:
    host: 172.19.103.47 # Redis server host.
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: weifuwu
@@ -35,6 +58,9 @@ data-source:
spring:
  profiles: prod
  redis:
    host: 11.1.2.20 # Redis server host.
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha

svr-pack-mgr.yml

@@ -1,7 +1,7 @@
logging:
  level:
    com:
      netflix: DEBUG
      netflix: ERROR
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
@@ -27,10 +27,30 @@ fast-dfs:
    anti-steal-token: no
    secret-key: FastDFS1234567890
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    password: # Login password of the redis server.
    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.
---
spring:
  profiles: dev
  redis:
    host: 192.168.1.220 # Redis server host.
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
@@ -44,6 +64,9 @@ fast-dfs:
spring:
  profiles: test
  redis:
    host: 172.19.103.47 # Redis server host.
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: weifuwu
@@ -56,6 +79,9 @@ fast-dfs:
spring:
  profiles: prod
  redis:
    host: 11.1.2.20 # Redis server host.
fast-dfs:
  tracker-server: 11.1.2.9:22122

svr-pack-resolve.yml

@@ -2,22 +2,11 @@ logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1
  max-total: 20
  max-idle: 10
  min-idle: 1
  validation-query: SELECT 1
  test-on-borrow: true
  remove-abandoned-timeout: 55
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    host: localhost # Redis server host.
    port: 6379 # Redis server port.
    password: # Login password of the redis server.
    timeout: 0 # Connection timeout in milliseconds.
@@ -44,16 +33,51 @@ fast-dfs:
  connect-timeout: 2
  network-timeout: 30
  fast-dfs:
    charset: ISO8859-1
  charset: ISO8859-1
  http:
    tracker-http-port: 80
    anti-steal-token: no
    secret-key: FastDFS1234567890
profile:
  data-buffer-size: 200   # 记录缓冲区数量
hadoop:
  hbase-properties:
    - hbase.zookeeper.property.clientPort: 2181
    - zookeeper.znode.parent: /hbase-unsecure
# 提取器参数，从数据集中提取摘要、事件时间与身份标识
extractor:
  # 事件提取参数
  # 门诊从“门诊摘要”与“挂号”数据集提取事件
  # 住院从“病人摘要”，“入院记录”与“病案首页”提取事件
  # 值用于生成事件摘要
  event:
    data-sets:
      - HDSC01_01: 门诊
      - HDSC01_02: 门诊
      - HDSC02_01: 住院
      - HDSC02_02: 住院
      - HDSC02_09: 住院
    meta-data:
      - HDSD00_01_457_D # 挂号时间
      - HDSD00_01_185_D # 出院时间
  # 身份提取参数，从人口学处提取
  identity:
    data-sets:
      - HDSA00_01
    meta-data:
      id-card-no: HDSA00_01_017_S     # 身份标识
      id-card-type: HDSA00_01_016_S   # 身份类型
  # 卡提取参数
  card:
    data-sets:
      - HDSC01_01: 门诊-病人摘要
      - HDSC01_02: 门诊-挂号
      - HDSC02_01: 住院-病人摘要
      - HDSC02_02: 住院-首页
    meta-data:
      - CARD_NO
      - CARD_TYPE
#error code and message
@@ -62,41 +86,39 @@ spring:
  profiles: dev
  redis:
    host: 172.19.103.47 # Redis server host.
    host: 192.168.1.220 # Redis server host.
  data:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
fast-dfs:
  tracker-server: 172.19.103.54:22122
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
---
spring:
  profiles: test
  redis:
    host: 172.17.110.68 # Redis server host.
    host: 172.19.103.47 # Redis server host.
  data:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
fast-dfs:
  tracker-server: 172.19.103.13:22122
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
---
spring:
  profiles: prod
@@ -109,10 +131,9 @@ spring:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  password: jkzlxm
fast-dfs:
  tracker-server: 11.1.2.9:22122
  tracker-server: 11.1.2.9:22122
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com

svr-standard.yml

@@ -1,7 +1,7 @@
logging:
  level:
    com:
      netflix: DEBUG
      netflix: ERROR
      
common.query.not.found: 该{0}不存在：{1}
common.miss.parameter: 参数不能为空：{0}！
@@ -35,10 +35,35 @@ fast-dfs:
    anti-steal-token: no
    secret-key: FastDFS1234567890
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    password: # Login password of the redis server.
    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.
  # SOLR (SolrProperties)
  data:
    solr:
      repositories.enabled: true # Enable Solr repositories.
---
spring:
  profiles: dev
  redis:
    host: 192.168.1.220 # Redis server host.
hibernate:
  show-sql: true
  format-sql: true
@@ -46,6 +71,7 @@ hibernate:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: 172.19.103.54:22122
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
@@ -55,9 +81,13 @@ data-source:
spring:
  profiles: test
  redis:
    host: 172.19.103.47 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: 172.19.103.52:80
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: weifuwu
@@ -71,6 +101,9 @@ hibernate:
spring:
  profiles: prod
  redis:
    host: 11.1.2.20 # Redis server host.
hibernate:
  show-sql: true
  format-sql: true

svr-user.yml

@@ -1,7 +1,7 @@
logging:
  level:
    com:
      netflix: DEBUG
      netflix: ERROR
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
@@ -35,10 +35,6 @@ data-source:
spring:
  profiles: prod
hibernate:
  show-sql: true
  format-sql: true
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha