hill9868 пре 5 година
родитељ
комит
46ebd4844e
16 измењених фајлова са 131 додато и 126 уклоњено
  1. 2 2
      ag-admin.yml
  2. 4 4
      ag-zuul.yml
  3. 16 15
      app-ehr-admin.yml
  4. 6 5
      app-ehr-portal.yml
  5. 10 10
      app-emergency-server.yml
  6. 3 3
      application.yml
  7. 7 7
      hos-broker-37.yml
  8. 7 7
      hos-broker.yml
  9. 4 3
      svr-authentication.yml
  10. 23 21
      svr-basic.yml
  11. 7 7
      svr-dfs.yml
  12. 9 9
      svr-pack-analyzer.yml
  13. 9 9
      svr-pack-mgr.yml
  14. 11 11
      svr-pack-resolve.yml
  15. 3 3
      svr-redis.yml
  16. 10 10
      svr-resource.yml

+ 2 - 2
ag-admin.yml

@ -21,7 +21,7 @@ zuul:
  routes:
    fastdfs-server:
      path: /file/**
      url: http://172.19.103.52:80/
      url: http://172.26.0.200:80/
---
spring:
@ -36,4 +36,4 @@ zuul:
  routes:
    fastdfs-server:
      path: /file/**
      url: http://172.19.103.52:80/
      url: http://172.19.103.52:80/

+ 4 - 4
ag-zuul.yml

@ -23,8 +23,8 @@ spring:
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
zuul:
  routes:
@ -38,7 +38,7 @@ zuul:
      url: http://service.yihu.com:8085/
    fastdfs-server:
      path: /file/**
      url: http://172.19.103.52:80/
      url: http://172.26.0.200:80/
    # 卫计委官网
    gov-server:
      path: /open/govServer/**
@ -75,4 +75,4 @@ zuul:
    # 应急指挥
    emergency-server:
      path: /open/baidu/**
      url: http://yingyan.baidu.com/
      url: http://yingyan.baidu.com/

+ 16 - 15
app-ehr-admin.yml

@ -40,33 +40,34 @@ spring:
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
app:
  baseClientId: zkGuSIm2Fg  # 【基础信息管理】应用
  qcReportClientId: 2YTOSRI0tw
  resourceBrowseClientId: W8RDizgDIB
  browseClientId: uzs5G0HgTp
  oauth2InnerUrl: http://172.26.0.108:10001/authentication/
  oauth2InnerUrl: http://172.26.0.125:10001/authentication/
  oauth2OuterUrl: http://27.154.233.186:10260  #厦门-认证外网
service-gateway:
  username: user
  password: eureka
  url: http://172.26.0.108:10000/api/v1.0/admin
  adminInnerUrl: http://172.26.0.108:10000
  stdurl: http://172.26.0.108:10000/api/v1.0/admin/std
  versionurl: http://172.26.0.108:10000/api/v1.0/admin/version
  cdatypeurl: http://172.26.0.108:10000/api/v1.0/admin/cda_type
  stdsourceurl: http://172.26.0.108:10000/api/v1.0/admin/standard_source
  adaption: http://172.26.0.108:10000/api/v1.0/adapter
  standard: http://172.26.0.108:10000/api/v1.0/std
  url: http://172.26.0.125:10000/api/v1.0/admin
  adminInnerUrl: http://172.26.0.125:10000
  stdurl: http://172.26.0.125:10000/api/v1.0/admin/std
  versionurl: http://172.26.0.125:10000/api/v1.0/admin/version
  cdatypeurl: http://172.26.0.125:10000/api/v1.0/admin/cda_type
  stdsourceurl: http://172.26.0.125:10000/api/v1.0/admin/standard_source
  adaption: http://172.26.0.125:10000/api/v1.0/adapter
  standard: http://172.26.0.125:10000/api/v1.0/std
  #browseClientUrl: http://192.168.1.221:8010/profile/browser
  browseClientUrl: http://172.19.103.70:1235/profile
  browseClientUrl: http://172.26.0.125:1235/profile
  browseClientOutSizeUrl: http://27.154.233.186:9480/profile
  profileurl: http://172.19.103.83:9009/api/v1.0
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 172.26.0.200:22122
  public-server: http://172.26.0.200:80
std:
  version: 59083976eebd
@ -146,4 +147,4 @@ fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
std:
  version: 59083976eebd
  version: 59083976eebd

+ 6 - 5
app-ehr-portal.yml

@ -23,13 +23,14 @@ app:
spring:
  profiles: dev
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
service-gateway:
  adminInnerUrl: http://172.26.0.108:10000
  adminInnerUrl: http://172.26.0.125:10000
  adminOuterUrl: http://27.154.233.186:10000
  zuulOuterUrl: http://27.154.233.186:1235/gateway
  profileInnerUrl: http://172.26.0.108:10000/api/v1.0/admin
  profileInnerUrl: http://172.26.0.125:10000/api/v1.0/admin
server:
  jsp-servlet:
    init-parameters:
@ -57,4 +58,4 @@ spring:
service-gateway:
  adminInnerUrl: http://11.1.2.13:10000
  zuulOuterUrl: http://11.1.2.13:10001
  profileInnerUrl: http://11.1.2.13:10000/api/v1.0/admin
  profileInnerUrl: http://11.1.2.13:10000/api/v1.0/admin

+ 10 - 10
app-emergency-server.yml

@ -28,16 +28,16 @@ app:
spring:
  profiles: dev
  redis:
    host: 172.19.103.47 # Redis server host.
    host: 172.26.0.253 # Redis server host.
    port: 6379
    password: redis!@456
    password:
app:
  oauth2InnerUrl: http://172.19.103.73:10260/
  oauth2InnerUrl: http://172.26.0.125:10260/
  oauth2OuterUrl: http://27.154.233.186:10260/
service-gateway:
  adminInnerUrl: http://172.19.103.73:10000
  profileInnerUrl: http://172.19.103.73:10000/api/v1.0/admin
  yingyanUrl: http://172.19.103.73:10001/open/baidu
  adminInnerUrl: http://172.26.0.125:10000
  profileInnerUrl: http://172.26.0.125:10000/api/v1.0/admin
  yingyanUrl: http://172.26.0.125:10001/open/baidu
---
spring:
@ -47,12 +47,12 @@ spring:
    port: 6379
    password: redis!@456
app:
  oauth2InnerUrl: http://172.19.103.73:10260/
  oauth2InnerUrl: http://172.26.0.125:10260/
  oauth2OuterUrl: http://27.154.233.186:10260/
service-gateway:
  adminInnerUrl: http://172.19.103.73:10000
  profileInnerUrl: http://172.19.103.73:10000/api/v1.0/admin
  yingyanUrl: http://172.19.103.73:10001/open/baidu
  adminInnerUrl: http://172.26.0.125:10000
  profileInnerUrl: http://172.26.0.125:10000/api/v1.0/admin
  yingyanUrl: http://172.26.0.125:10001/open/baidu
---
spring:

+ 3 - 3
application.yml

@ -58,7 +58,7 @@ zuul:
ag-admin.server.port: 10000
ag-cloud.server.port: 10400
ag-zuul.server.port: 10001
svr-basic.server.port: 10300
svr-ehr-basic.server.port: 10300
svr-dfs.server.port: 10770
svr-health-profile.server.port: 9009
svr-pack-analyzer.server.port: 10340
@ -122,7 +122,7 @@ eureka:
  instance:
    prefer-ip-address: false
eureka-server-ip: 172.26.0.108:8761
eureka-server-ip: 172.26.0.125:8761
---
spring:
@ -134,4 +134,4 @@ eureka:
  instance:
    prefer-ip-address: false
eureka-server-ip: 172.19.103.73:8761
eureka-server-ip: 172.19.103.73:8761

+ 7 - 7
hos-broker-37.yml

@ -6,7 +6,7 @@ server:
# the name of Camel
camel:
  springboot:
    name: hos-broker-37
    name: hos-broker
---
@ -57,12 +57,12 @@ hzy:
spring:
  profiles: test
  activemq:
      broker-url: tcp://172.19.103.42:61616 # activeMq地址
      broker-url: tcp://172.19.103.57:61616 # activeMq地址
      user: admin
      password: admin
  data:
    mongodb:
      host: 172.19.103.42 # mongodb 连接信息
      host: 172.19.103.57 # mongodb 连接信息
      port: 27017
      username: esb
      password: esb
@ -74,12 +74,12 @@ log:
  level: info
hos:
  filesystem:
    url: http://172.19.103.37:9010/dfs/file #文件服务器地址
    url: http://172.19.103.58:9010/dfs/file #文件服务器地址
  arbiter:
    enable: true
    url: http://172.19.103.37:10135  # arbiter 的连接地址
    url: http://172.19.103.58:10135  # arbiter 的连接地址
  rest:
    url: http://172.19.103.37:8088  # 采集上传档案等服务连接地址
    url: http://172.19.103.58:8088  # 采集上传档案等服务连接地址
  timer:
      period: 10000
  tenant:
@ -88,7 +88,7 @@ hos:
    path: /usr/local/mycat/   ##mycat的安装目录
  #jcraft shell操作,连接终端服务器的后门信息
  jcraft:
    host: 172.19.103.37
    host: 172.19.103.57
    port: 22
    user: root
    password: ceshi

+ 7 - 7
hos-broker.yml

@ -6,7 +6,7 @@ server:
# the name of Camel
camel:
  springboot:
    name: hos-broker
    name: hos-broker-37
---
@ -57,12 +57,12 @@ hzy:
spring:
  profiles: test
  activemq:
      broker-url: tcp://172.19.103.57:61616 # activeMq地址
      broker-url: tcp://172.19.103.42:61616 # activeMq地址
      user: admin
      password: admin
  data:
    mongodb:
      host: 172.19.103.57 # mongodb 连接信息
      host: 172.19.103.42 # mongodb 连接信息
      port: 27017
      username: esb
      password: esb
@ -74,12 +74,12 @@ log:
  level: info
hos:
  filesystem:
    url: http://172.19.103.58:9010/dfs/file #文件服务器地址
    url: http://172.19.103.37:9010/dfs/file #文件服务器地址
  arbiter:
    enable: true
    url: http://172.19.103.58:10135  # arbiter 的连接地址
    url: http://172.19.103.37:10135  # arbiter 的连接地址
  rest:
    url: http://172.19.103.58:8088  # 采集上传档案等服务连接地址
    url: http://172.19.103.37:8088  # 采集上传档案等服务连接地址
  timer:
      period: 10000
  tenant:
@ -88,7 +88,7 @@ hos:
    path: /usr/local/mycat/   ##mycat的安装目录
  #jcraft shell操作,连接终端服务器的后门信息
  jcraft:
    host: 172.19.103.57
    host: 172.19.103.37
    port: 22
    user: root
    password: ceshi

+ 4 - 3
svr-authentication.yml

@ -23,8 +23,9 @@ spring:
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
fz-gateway:
  url: http://172.26.0.108:10001/fzGateway/WSGW/rest
  clientId: 9000401
@ -46,4 +47,4 @@ fz-gateway:
  url: http://192.168.220.84:10001/fzGateway/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  handlerId: 50641
  handlerId: 50641

+ 23 - 21
svr-basic.yml

@ -1,3 +1,5 @@
server: 
  port: 10030
info:
  app:
    name: SVR-BASIC
@ -68,8 +70,8 @@ spring:
    root: dc=ehr,dc=jkzl
  # -- unknown use --
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
  data:
    mongodb:
@ -80,18 +82,18 @@ spring:
      authenticationDatabase: admin
      database: ehr
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
      zk-host: jkzl-node1:2181/solr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
      uris: http://172.26.0.15:9200
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 172.26.0.200:22122
  public-server: http://172.26.0.200:80
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host: http://172.19.103.68:9200
  tHost: 172.19.103.68:9300
  host: http://172.26.0.15:9200
  tHost: 172.26.0.15:9300
  clusterName: jkzl
h5:
  secret: KU5XTORDKZI3O86YAT3ABCNJW2XTL1DJYF3GKU3ICXL
@ -99,7 +101,7 @@ h5:
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://172.26.0.108:10001/fzGateway/WSGW/rest
  url: http://172.26.0.125:10001/fzGateway/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  secret: KU5XTORDKZI3O86YAT3ABCNJW2XTL1DJYF3GKU3ICXL
@ -109,9 +111,9 @@ fz-gateway:
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
    url: jdbc:mysql://172.26.0.125:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
  # -- unknown use --
  ldap:
    host: 172.19.103.87
@ -121,9 +123,9 @@ spring:
    root: dc=ehr,dc=jkzl
  # -- unknown use --
  redis:
    host: 172.19.103.47 # Redis server host.
    host: 172.26.0.253 # Redis server host.
    port: 6379
    password: redis!@456
    password:
  data:
    mongodb:
      host: 192.168.1.220
@ -133,18 +135,18 @@ spring:
      authenticationDatabase: admin
      database: ehr
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
      zk-host: jkzl-node1:2181/solr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
      uris: http://172.26.0.15:9200
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 172.26.0.200:22122
  public-server: http://172.26.0.200:80
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host: http://172.19.103.68:9200
  tHost: 172.19.103.68:9300
  host: http://172.26.0.15:9200
  tHost: 172.26.0.15:9300
  clusterName: jkzl
h5:
  secret: KU5XTORDKZI3O86YAT3ABCNJW2XTL1DJYF3GKU3ICXL
@ -159,4 +161,4 @@ fz-gateway:
  handlerId: 50871
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: jkzl-node1,jkzl-node2,jkzl-node3

+ 7 - 7
svr-dfs.yml

@ -40,15 +40,15 @@ elasticsearch:
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
    url: jdbc:mysql://172.26.0.104:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
  cluster-nodes: 172.26.0.15:9300
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 172.26.0.200:22122
  public-server: http://172.26.0.200:80
---
spring:
@ -62,4 +62,4 @@ elasticsearch:
  cluster-nodes: 172.19.103.9:9300
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  public-server: http://172.19.103.52:80

+ 9 - 9
svr-pack-analyzer.yml

@ -63,19 +63,19 @@ elasticsearch:
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
    url: jdbc:mysql://172.26.0.104:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52
  tracker-server: 172.26.0.200:22122
  public-server: http://172.26.0.200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
  cluster-nodes: 172.26.0.15:9300
---
spring:
@ -96,4 +96,4 @@ fast-dfs:
  public-server: http://172.19.103.52
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
  cluster-nodes: 172.19.103.9:9300

+ 9 - 9
svr-pack-mgr.yml

@ -54,19 +54,19 @@ eip:
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
    url: jdbc:mysql://172.26.0.104:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 172.26.0.200:22122
  public-server: http://172.26.0.200:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
  cluster-nodes: 172.26.0.15:9300
---
spring:
@ -84,4 +84,4 @@ fast-dfs:
  public-server: http://172.19.103.52:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
  cluster-nodes: 172.19.103.9:9300

+ 11 - 11
svr-pack-resolve.yml

@ -65,27 +65,27 @@ eip:
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
    url: jdbc:mysql://172.26.0.104:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
  kafka:
    bootstrap-servers: node4.hde.h3c.com:6667
    bootstrap-servers: jkzl-node1:6667
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 172.26.0.200:22122
  public-server: http://172.26.0.200:80
  pacs-group-name: group1 # 影像文件落入到group1上
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: jkzl-node1,jkzl-node2,jkzl-node3
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
  cluster-nodes: 172.26.0.15:9300
ftp:
  address: 172.19.103.58
  username: pacs
  password: pacssr2018
  port: 21
  port: 21

+ 3 - 3
svr-redis.yml

@ -41,8 +41,8 @@ spring:
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
ehr-redis:
  mq:
@ -65,4 +65,4 @@ ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
      responseTimeChannel: redis.cache.reponse-time

+ 10 - 10
svr-resource.yml

@ -57,25 +57,25 @@ h5:
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
    url: jdbc:mysql://172.26.0.104:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.108
    port: 6390
    host: 172.26.0.253
    port: 6379
    password:
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
      zk-host: jkzl-node1,jkzl-node2,jkzl-node3:2181/infra-solr
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
    hbase.zookeeper.quorum: jkzl-node1,jkzl-node2,jkzl-node3
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 172.26.0.200:22122
  public-server: http://172.26.0.200:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
  cluster-nodes: 172.26.0.15:9300
---
spring: