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

ag-zuul.yml

@@ -30,9 +30,17 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8085/
    fastdfs-server:
      path: /file/**
      url: http://172.19.103.52:80/
    # 卫计委官网
    gov-server:
      path: /open/govServer/**
      url: http://www.srswjw.gov.cn:8080/
---
spring:
@@ -47,9 +55,17 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8085/
    fastdfs-server:
      path: /file/**
      url: http://172.19.103.52:80/
    # 卫计委官网
    gov-server:
      path: /open/govServer/**
      url: http://www.srswjw.gov.cn:8080/
---
spring:
@@ -63,9 +79,17 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: https://api.yihu.com/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8085/
    fastdfs-server:
      path: /file/**
      url: http://11.1.2.9:80/
    # 卫计委官网
    gov-server:
      path: /open/govServer/**
      url: http://www.srswjw.gov.cn:8080/
---
spring:
@@ -80,9 +104,17 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: https://api.yihu.com/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8080/
    fastdfs-server:
      path: /file/**
      url: http://10.176.97.5:8888/
    # 卫计委官网
    gov-server:
      path: /open/govServer/**
      url: http://www.srswjw.gov.cn:8080/
---
spring:
@@ -97,9 +129,17 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: https://api.yihu.com/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8080/
    fastdfs-server:
      path: /file/**
      url: http://100.100.1.157:8888/
    # 卫计委官网
    gov-server:
      path: /open/govServer/**
      url: http://www.srswjw.gov.cn:8080/
---
spring:
@@ -114,6 +154,14 @@ zuul:
    jkzl-server:
      path: /jkzl/**
      url: https://api.yihu.com/OpenPlatform/cgiBin/1.0/
    # 福州总部网关
    fz-gateway:
      path: /fzGateway/**
      url: http://service.yihu.com:8080/
    fastdfs-server:
      path: /file/**
      url: http://192.168.50.37:8888/
      url: http://192.168.50.37:8888/
    # 卫计委官网
    gov-server:
      path: /open/govServer/**
      url: http://www.srswjw.gov.cn:8080/

application.yml

@@ -144,7 +144,7 @@ spring:
#else the server must have host map.
eureka:
  instance:
    prefer-ip-address: true
    prefer-ip-address: false
eureka-server-ip: 11.1.2.1:8761
@@ -156,7 +156,7 @@ spring:
#else the server must have host map.
eureka:
  instance:
    prefer-ip-address: true
    prefer-ip-address: false
eureka-server-ip: 10.176.97.10:8761
#eureka-server-ip: 171.35.109.46:8761
@@ -170,7 +170,7 @@ spring:
#else the server must have host map.
eureka:
  instance:
    prefer-ip-address: true
    prefer-ip-address: false
eureka-server-ip: 100.100.1.162:8761
@@ -179,6 +179,6 @@ spring:
  profiles: prod_srformal
eureka:
  instance:
    prefer-ip-address: true
    prefer-ip-address: false
eureka-server-ip: 192.168.200.61:8761

svr-basic.yml

@@ -25,7 +25,7 @@ fast-dfs:
  network-timeout: 60
  charset: ISO8859-1
  pool:
    init-size: 5
    init-size: 1
    max-size: 20
    wait-time: 500
  http:
@@ -37,15 +37,9 @@ eip:
  #健康上饶app-卫计委机构编码--用于居民注册设置默认权限
jksr-app:
  orgcode: PDY026797
  registerRoleClientId: WYo0l73F8e,HPnz4GXfYA #用于创建这些应用的默认角色(健康上饶app，公众健康服务)
hadoop:
  hbase-properties:
    hbase.zookeeper.property.clientPort: 2181
    zookeeper.znode.parent: /hbase-unsecure
  user:
    name: root
---
spring:
  profiles: dev
@@ -73,8 +67,6 @@ spring:
      password: admin
      authenticationDatabase: admin
      database: ehr
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
@@ -93,14 +85,11 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8085/WSGW/rest
  url: http://172.19.103.73:10001/fzGateway/WSGW/rest
  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
---
spring:
@@ -129,8 +118,6 @@ spring:
      password: admin
      authenticationDatabase: admin
      database: ehr
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
@@ -149,14 +136,11 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8085/WSGW/rest
  url: http://172.19.103.73:10001/fzGateway/WSGW/rest
  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
---
spring:
@@ -186,8 +170,6 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
@@ -206,14 +188,11 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  url: http://11.1.2.13:10001/fzGateway/WSGW/rest
  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
  handlerId: 50871
---
spring:
@@ -242,8 +221,6 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr
  elasticsearch:
    jest:
      uris: http://10.176.97.7:9200
@@ -263,14 +240,11 @@ h5:
  handlerId: 50871
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  url: http://10.176.97.10:10001/fzGateway/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
---
spring:
@@ -299,8 +273,6 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr
  elasticsearch:
    jest:
      uris: http://100.100.1.158:9200
@@ -319,14 +291,11 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  url: http://100.100.1.162:10001/fzGateway/WSGW/rest
  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
---
spring:
@@ -355,19 +324,17 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
    solr:
      zk-host: node1.jkzl.com,node2.jkzl.com,node4.jkzl.com:2181/solr
  elasticsearch:
    jest:
      uris: http://172.10.10.2:9200
      uris: http://172.10.10.5:9200
fast-dfs:
  tracker-server: 192.168.50.116:22122,192.168.50.119:22122
  public-server: http://192.168.50.37:8888
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host: http://172.10.10.2:9200
  tHost: 172.10.10.2:9300
  host: http://172.10.10.5:9200
  tHost: 172.10.10.5:9300
  clusterName: jkzl
h5:
  secret: 9U6PBF2JM3PE1IHRJ7GEITMJHNMEHOFZQ2XUCKD9TO2
@@ -375,11 +342,8 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  url: http://192.168.220.84:10001/fzGateway/WSGW/rest
  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-dfs.yml

@@ -27,8 +27,8 @@ fast-dfs:
elasticsearch:
  pool:
    init-size: 5
    max-size: 10
    init-size: 2
    max-size: 5
---
spring:
@@ -109,7 +109,7 @@ spring:
    password: GP8Qz4qU
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.10.10.2:9300,172.10.10.5:9300
  cluster-nodes: 172.10.10.5:9300
fast-dfs:
  tracker-server: 192.168.50.116:22122,192.168.50.119:22122
  public-server: http://192.168.50.37:8888

svr-pack-analyzer.yml

@@ -153,7 +153,7 @@ elasticsearch:
  cluster-nodes: 100.100.1.158:9300
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
@@ -171,7 +171,7 @@ fast-dfs:
  public-server: http://192.168.50.37:8888
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.10.10.2:9300
  cluster-nodes: 172.10.10.5:9300
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node4.jkzl.com

svr-pack-mgr.yml

@@ -128,4 +128,4 @@ fast-dfs:
  public-server: http://192.168.50.37:8888
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.10.10.2:9300,172.10.10.5:9300
  cluster-nodes: 172.10.10.5:9300

svr-pack-resolve.yml

@@ -48,6 +48,11 @@ hadoop:
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
ftp:
  address: 172.19.103.58
  username: pacs
  password: pacssr2018
  port: 21
---
spring:
@@ -69,6 +74,11 @@ hadoop:
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
ftp:
  address: 172.19.103.58
  username: pacs
  password: pacssr2018
  port: 21
---
spring:
@@ -90,6 +100,11 @@ hadoop:
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 11.1.2.7:9300
ftp:      #----------------------------------todo 待配置
  address: 172.19.103.58
  username: pacs
  password: pacssr2018
  port: 21    #----------------------------------todo 待配置
---
spring:
@@ -111,6 +126,11 @@ hadoop:
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 10.176.97.7:9300
ftp:      #----------------------------------todo 待配置
  address: 172.19.103.58
  username: pacs
  password: pacssr2018
  port: 21    #----------------------------------todo 待配置
---
spring:
@@ -128,10 +148,15 @@ fast-dfs:
  public-server: http://100.100.1.157:8888
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 100.100.1.158:9300
ftp:      #----------------------------------todo 待配置
  address: 172.19.103.58
  username: pacs
  password: pacssr2018
  port: 21    #----------------------------------todo 待配置
---
spring:
@@ -152,4 +177,9 @@ hadoop:
    hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node4.jkzl.com
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.10.10.2:9300,172.10.10.5:9300
  cluster-nodes: 172.10.10.5:9300
ftp:      #----------------------------------todo 待配置
  address: 172.19.103.58
  username: pacs
  password: pacssr2018
  port: 21    #----------------------------------todo 待配置

svr-quota.yml

@@ -119,7 +119,7 @@ spring:
    password: q4YaQemf
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com:2181/solr
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
  elasticsearch:
    jest:
      uris: http://100.100.1.158:9200
@@ -143,7 +143,7 @@ spring:
      zk-host: node1.jkzl.com,node2.jkzl.com,node4.jkzl.com:2181/solr
  elasticsearch:
    jest:
      uris: http://172.10.10.2:9200
      uris: http://172.10.10.5:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.10.10.2:9300,172.10.10.5:9300
  cluster-nodes: 172.10.10.5:9300

svr-resource.yml

@@ -36,6 +36,11 @@ fast-dfs:
    anti-steal-token: no
    secret-key: FastDFS1234567890
elasticsearch:
  pool:
    init-size: 1
    max-size: 5
eip:
  tenant: jkzl
h5:
@@ -183,4 +188,4 @@ fast-dfs:
  public-server: http://192.168.50.37:8888
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.10.10.2:9300,172.10.10.5:9300
  cluster-nodes: 172.10.10.5:9300