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

hos-admin.yml

@@ -39,9 +39,9 @@ hos:
  saasAdmin: jkzl #SAAS管理员账号,暂时配置在此处
  clientId: 0e3DIdNaQ2
  zbus:
    url: 172.19.103.57:9020
    url: 172.19.103.58:9020
  filesystem:
    url: http://172.19.103.57:9010/dfs/file
    url: http://172.19.103.58:9010/dfs/file
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
@@ -90,7 +90,7 @@ hos:
  zbus:
    url: 172.19.103.58:9020
  filesystem:
    url: http://172.19.103.57:9010/dfs/file
    url: http://172.19.103.58:9010/dfs/file
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
@@ -156,8 +156,8 @@ hos:
  filesystem:
    url: http://192.168.200.62:9010/dfs/file
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
  tracker-server: 192.168.50.116:22122
  public-server: http://192.168.50.37:8888
jwt:
  header: Authorization
  secret: mySecret
@@ -354,4 +354,6 @@ jwt:
  header: Authorization
  secret: mySecret
  expiration: 604800
  tokenHead: "Bearer "
  tokenHead: "Bearer "

svr-basic.yml

@@ -97,6 +97,7 @@ fz-gateway:
  clientId: 9000401
  clientVersion: 1.0
  secret: KU5XTORDKZI3O86YAT3ABCNJW2XTL1DJYF3GKU3ICXL
  handlerId: 50871
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
@@ -110,11 +111,11 @@ spring:
    password: weifuwu
  # -- unknown use --
  ldap:
      host: 172.19.103.87
      port: 389
      bindDn: cn=admin,dc=ehr,dc=jkzl
      password: jkzl
      root: dc=ehr,dc=jkzl
    host: 172.19.103.87
    port: 389
    bindDn: cn=admin,dc=ehr,dc=jkzl
    password: jkzl
    root: dc=ehr,dc=jkzl
  # -- unknown use --
  redis:
    host: 172.19.103.47 # Redis server host.
@@ -152,6 +153,7 @@ fz-gateway:
  clientId: 9000401
  clientVersion: 1.0
  secret: KU5XTORDKZI3O86YAT3ABCNJW2XTL1DJYF3GKU3ICXL
  handlerId: 50871
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
@@ -208,6 +210,7 @@ fz-gateway:
  clientId: 9000401
  clientVersion: 1.0
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2
  handlerId: 50641
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com
@@ -257,12 +260,14 @@ h5:
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2
  appId: 9000401
  clientId: WYo0l73F8e
  handlerId: 50871
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2
  handlerId: 50641
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
@@ -318,6 +323,7 @@ fz-gateway:
  clientId: 9000401
  clientVersion: 1.0
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2
  handlerId: 50641
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com
@@ -373,6 +379,7 @@ fz-gateway:
  clientId: 9000401
  clientVersion: 1.0
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2
  handlerId: 50641
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node4.jkzl.com

svr-pack-resolve.yml

@@ -28,12 +28,6 @@ hadoop:
  user:
    name: root
resolve:
  job:
    init-size: 10 #解析入库初始任务数
    max-size: 10 #解析入库最大任务数
    cron-exp: 0/1 * * * * ? #解析任务触发间隔表达式
---
spring:
  profiles: dev