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

ag-admin.yml

@@ -4,14 +4,14 @@ logging:
      netflix: DEBUG
ribbon:
  ReadTimeout: 300000
  ReadTimeout: 3000000
  ConnectTimeout: 6000
zuul:
  routes:
    adapterDataSet:
      path: /api/v1.0/adapter/plan/adapterDataSet
      serviceId: svr-adaption
      serviceId: svr-standard
    saveDataSetRelationships:
      path: /api/v1.0/std/documents/data_set_relationships
      serviceId: svr-standard
@@ -25,13 +25,6 @@ zuul:
      path: /api/v1.0/esb/updateHosEsbMiniRelease
      serviceId: svr-esb
hystrix:
  command:
    default:
      execution:
        isolation:
          thread:
            timeoutInMilliseconds: 300000
---
spring:

ag-ehr-cloud.yml

@@ -48,7 +48,6 @@ spring:
server:
  ssl:
    key-store: C:/Windows/tomcat.keystore
    key-store-password: 123456
    key-password: 123456
@@ -86,6 +85,7 @@ spring:
server:
  ssl:
    key-store-password: 123456
    key-store: tomcat.keystore
    key-password: 123456
---

application.yml

@@ -11,6 +11,14 @@ deploy:
default:
  password: 123456
hystrix:
  command:
    default:
      execution:
        isolation:
          thread:
            timeoutInMilliseconds: 3000000
ehr:
  redis-key-schema:
    std:
@@ -34,6 +42,12 @@ ehr:
    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
@@ -67,6 +81,7 @@ svr-family.server.port: 10190
svr-health-profile-search.server.port: 10200
svr-workflow.server.port: 10210
svr-resource.server.port: 10220
svr-archive-security.server.port: 10230
#Application acuator
endpoints:
@@ -125,7 +140,7 @@ eureka:
  instance:
    prefer-ip-address: false
eureka-server-ip: 172.19.103.11:8761
eureka-server-ip: 192.168.1.221:8761
---
spring:

svr-archive-security.yml

@@ -0,0 +1,62 @@
logging:
  level:
    com:
      netflix: DEBUG
spring:
  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://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # Redis server host.
---
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.
---
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.
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm
  redis:
    host: 11.1.2.20 # Redis server host.

svr-dict.yml

@@ -71,7 +71,7 @@ spring:
  redis:
    host: 11.1.2.20 # Redis server host.
  data-source:
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm

svr-health-profile.yml

@@ -81,7 +81,7 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
  public-server: http://172.19.103.54:80
---
spring:
@@ -105,7 +105,7 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
  public-server: http://172.19.103.54:80
  
---
spring:
@@ -128,8 +128,8 @@ hadoop:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80
---
spring:
@@ -140,7 +140,7 @@ spring:
  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: 11.1.2.51,11.1.2.52,11.1.2.53:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8

svr-org.yml

@@ -103,12 +103,13 @@ spring:
  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
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: jkzlxm

svr-pack-resolve.yml

@@ -169,7 +169,7 @@ 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.
      zk-host: 11.1.2.51,11.1.2.52,11.1.2.53:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:

svr-resource.yml

@@ -93,8 +93,8 @@ spring:
  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: 11.1.2.51,11.1.2.52,11.1.2.53:2181/solr # ZooKeeper host address in the form HOST:PORT.
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com