redis和hbase配置更新

application.yml

@@ -19,40 +19,6 @@ hystrix:
          thread:
            timeoutInMilliseconds: 3000000
ehr:
  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
      data-set-is-multi-record: multi_record
      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
    resource-adaption:
      table: rs_adapter_metadata
      resource-meta-data: resource_metadata
    resource-metadata:
      table: rs_metadata
      column: dict_code
    resource-adapter-dict:
      table: rs_adapter_dictionary
      column: code_name
    hp_icd10_relation:
      table: hp_icd10_relation
      icd10_id: icd10_id
      icd10_code: icd10_code
      
#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: 参数解析错误
@@ -88,6 +54,7 @@ svr-authentication.server.port: 10260
svr-portal.server.port: 10250
svr-file-resource.server.port: 10270
svr-ehr-basic.server.port: 10300
svr-redis.server.port: 10310
#Application acuator
endpoints:
  restart:

svr-health-profile.yml

@@ -7,10 +7,6 @@ logging:
        web: INFO
      hibernate: ERROR
hadoop:
  hbase-properties:
    - hbase.zookeeper.property.clientPort: 2181
    - zookeeper.znode.parent: /hbase-unsecure
spring:
  # REDIS
@@ -22,7 +18,7 @@ spring:
    #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.
@@ -30,9 +26,6 @@ spring:
      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.
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
@@ -67,23 +60,12 @@ cda-document-type-options:
spring:
  profiles: dev
  redis:
    host: 192.168.1.220 # Redis server host.
  data:
    solr:
      #zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
hadoop:
  hbase-properties:
    #- hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
    - hbase.zookeeper.quorum: node1,node2,node3
fast-dfs:
  tracker-server: 172.19.103.54:22122
@@ -93,50 +75,25 @@ fast-dfs:
spring:
  profiles: alpha
  redis:
    host: 192.168.1.220 # Redis server host.
  data:
    solr:
      #zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
hadoop:
  hbase-properties:
    #- hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
    - hbase.zookeeper.quorum: node1,node2,node3
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80
  
---
spring:
  profiles: test
  redis:
    host: 172.19.103.47 # Redis server host.
  data:
    solr:
      #zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: weifuwu
    password: weifuwu
hadoop:
  hbase-properties:
    #- hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
    - hbase.zookeeper.quorum: node1,node2,node3
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80
@@ -145,22 +102,11 @@ fast-dfs:
spring:
  profiles: prod
  redis:
    host: 11.1.2.20 # Redis server host.
  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.hde.jkzlehr.com,node2.hde.jkzlehr.com,node3.hde.jkzlehr.com:2181/solr
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm
hadoop:
  hbase-properties:
    #- hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    - hbase.zookeeper.quorum: node1,node2,node3
fast-dfs:
  tracker-server: 11.1.2.9:22122

svr-pack-resolve.yml

@@ -48,6 +48,8 @@ hadoop:
  hbase-properties:
    - hbase.zookeeper.property.clientPort: 2181
    - zookeeper.znode.parent: /hbase-unsecure
  user:
    name: root
ehr:
  # 档案包数据提取器参数，从数据集中提取摘要、事件时间与身份标识

svr-redis.yml

@@ -0,0 +1,117 @@
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.
    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.
  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
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
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
  password: ha
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
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
    username: ha
    password: jkzlxm
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122

svr-resource.yml

@@ -11,6 +11,8 @@ hadoop:
  hbase-properties:
    - hbase.zookeeper.property.clientPort: 2181
    - zookeeper.znode.parent: /hbase-unsecure
  user:
    name: root
spring:
  datasource: