Pārlūkot izejas kodu

Merge branch 'dev' of EHR/ehr.config into master

hill9868 7 gadi atpakaļ
vecāks
revīzija
fb03a8e705
9 mainītis faili ar 52 papildinājumiem un 14 dzēšanām
  1. 1 1
      ag-ehr-cloud.yml
  2. 1 1
      svr-ehr-basic.yml
  3. 11 4
      svr-health-profile.yml
  4. 1 1
      svr-pack-mgr.yml
  5. 1 1
      svr-pack-resolve.yml
  6. 17 2
      svr-quota.yml
  7. 1 1
      svr-redis.yml
  8. 18 2
      svr-resource.yml
  9. 1 1
      svr-standard.yml

+ 1 - 1
ag-ehr-cloud.yml

@ -113,7 +113,7 @@ spring:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1

+ 1 - 1
svr-ehr-basic.yml

@ -117,7 +117,7 @@ fast-dfs:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1
  data:

+ 11 - 4
svr-health-profile.yml

@ -59,13 +59,12 @@ cda-document-type-options:
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: weifuwu
    password: weifuwu
  application:
    id: JKZL
fast-dfs:
  tracker-server: 172.19.103.13:22122
@ -79,6 +78,8 @@ spring:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
  application:
    id: JKZL
fast-dfs:
@ -93,6 +94,8 @@ spring:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: weifuwu
    password: weifuwu
  application:
    id: JKZL
fast-dfs:
  tracker-server: 172.19.103.13:22122
@ -106,6 +109,8 @@ spring:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm
  application:
    id: JKZL
fast-dfs:
@ -117,9 +122,11 @@ fast-dfs:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1
  application:
    id: JKZL
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122

+ 1 - 1
svr-pack-mgr.yml

@ -132,7 +132,7 @@ fast-dfs:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1
  redis:

+ 1 - 1
svr-pack-resolve.yml

@ -256,7 +256,7 @@ hadoop:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1
  redis:

+ 17 - 2
svr-quota.yml

@ -30,6 +30,11 @@ spring:
    username: weifuwu
    password: weifuwu
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
---
spring:
  profiles: test
@ -38,6 +43,9 @@ spring:
    username: weifuwu
    password: weifuwu
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
---
spring:
@ -48,10 +56,17 @@ spring:
    username: ha
    password: jkzlxm
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
---
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1
    password: data!@)1
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.

+ 1 - 1
svr-redis.yml

@ -124,7 +124,7 @@ fast-dfs:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1

+ 18 - 2
svr-resource.yml

@ -38,6 +38,11 @@ spring:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:
  profiles: alpha
@ -68,6 +73,10 @@ spring:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:
  profiles: prod
@ -85,12 +94,15 @@ hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1
  redis:
@ -102,4 +114,8 @@ spring:
      zk-host: node1.hde.jkzlehr.com,node2.hde.jkzlehr.com,node3.hde.jkzlehr.com:2181/solr
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122

+ 1 - 1
svr-standard.yml

@ -130,7 +130,7 @@ fast-dfs:
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://192.168.135.39:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    url: jdbc:mysql://192.168.135.39:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: sr_healtharchive
    password: data!@)1
  redis: