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

application.yml

@@ -73,7 +73,7 @@ endpoints:
spring:
  jmx:
    enabled: false
  
  jpa:
    database-platform: org.hibernate.dialect.MySQL5Dialect
    hibernate.dialect: org.hibernate.dialect.MySQL5Dialect

hos-admin.yml

@@ -17,7 +17,7 @@ spring:
  profiles: dev
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.19.103.57:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    url: jdbc:mysql://172.19.103.57:8066/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: 123456
    test-on-borrow: true
@@ -47,32 +47,38 @@ spring:
    proxy-target-class: true
hos:
  saasAdmin: jkzl #SAAS管理员账号,暂时配置在此处
  clientId: 0e3DIdNaQ2
  zbus:
    url: 172.19.103.37:9020
  filesystem:
    url: http://172.19.103.37:9010/dfs/file
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
jwt:
  header: Authorization
  secret: mySecret
  expiration: 604800
  tokenHead: "Bearer "
eip:
  manageAddress: http://localhost:8080 #配置跨域
---
spring:
  profiles: test
  jackson:
    serialization:
      INDENT_OUTPUT: true
  datasource:
      driverClassName: com.mysql.jdbc.Driver
      url: jdbc:mysql://172.19.103.57:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      username: hos
      password: 123456
      test-on-borrow: true
      validation-query: SELECT 1
      test-while-idle: true
      max-total: 100
      default-auto-commit: true
      max-idle: 50
      min-idle: 20
      initial-size: 10
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.19.103.57:8066/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: 123456
    test-on-borrow: true
    validation-query: SELECT 1
    test-while-idle: true
    max-total: 100
    default-auto-commit: true
    max-idle: 50
    min-idle: 20
    initial-size: 10
  jpa:
    database-platform: org.hibernate.dialect.MySQL5Dialect
    hibernate:
@@ -81,7 +87,7 @@ spring:
    show-sql: false
  data:
    mongodb:
      host: 172.19.103.42
      host: 172.19.103.57
      port: 27017
      username: esb
      password: esb
@@ -91,9 +97,85 @@ spring:
  aop:
    proxy-target-class: true
hos:
  saasAdmin: jkzl  #SAAS管理员账号,暂时配置在此处
  saasAdmin: jkzl #SAAS管理员账号,暂时配置在此处
  clientId: 0e3DIdNaQ2
  zbus:
    url: 172.19.103.37:9020
  filesystem:
    url: http://172.19.103.37:9010/dfs/file
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
jwt:
  header: Authorization
  secret: mySecret
  expiration: 604800
  tokenHead: "Bearer "
eip:
  manageAddress: http://172.19.103.57:8080 #配置跨域
---
spring:
  profiles: prod_sr
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://10.176.97.9:3310/tenant_central?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: jkzlesb
    password: Ajch6o@Y
    test-on-borrow: true
    validation-query: SELECT 1
    test-while-idle: true
    max-total: 100
    default-auto-commit: true
    max-idle: 50
    min-idle: 20
    initial-size: 10
# REDIS
  redis:
    host: 10.176.97.5 # Redis server host.
    port: 6390
    password: q4YaQemf
    database: 0 # Database index used by the connection factory.
    timeout: 0 # Connection timeout in milliseconds.
    #sentinel:
    #  master: # Name of Redis server.
    #  nodes: # Comma-separated list of host:port pairs.
    pool:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
  jpa:
    database-platform: org.hibernate.dialect.MySQL5Dialect
    hibernate:
      dialect: org.hibernate.dialect.MySQL5Dialect
    format-sql: true
    show-sql: false
  data:
    mongodb:
      host: 10.176.97.9
      port: 29000
      username: jkzlesb
      password: fgu$^ezl
      authenticationDatabase: admin
      gridFsDatabase: dfs
      database: runtime
  aop:
    proxy-target-class: true
hos:
  saasAdmin: jkzl #SAAS管理员账号,暂时配置在此处
  clientId: 0e3DIdNaQ2
  zbus:
    url: 10.176.97.14:9020
  filesystem:
    url: http://10.176.97.14:9010/dfs/file
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
jwt:
  header: Authorization
  secret: mySecret
  expiration: 604800
  tokenHead: "Bearer "
eip:
  manageAddress: http://10.176.97.14:8080

hos-broker.yml

@@ -1,13 +1,7 @@
spring:
  application:
    name: hos-broker
server:
  port: 8099
  contextPath:
  sessionTimeout:  300
security:
  basic:
    enabled: false
# the name of Camel
camel:
@@ -19,7 +13,7 @@ camel:
spring:
  profiles: dev
  activemq:
    broker-url: tcp://172.19.103.57:61616
    broker-url: tcp://172.19.103.42:61616
    user: admin
    password: admin
  data:
@@ -34,7 +28,7 @@ spring:
eureka:
  client:
    serviceUrl:
      defaultZone: http://192.168.1.221:8761/eureka/
      defaultZone: http://172.19.103.58:8761/eureka/
log:
  path: D://logs/logback/dev
@@ -44,9 +38,9 @@ hos:
    url: http://172.19.103.57:9010/dfs/file
  arbiter:
    enable: true
    url: http://localhost:10135
    url: http://192.168.131.106:10135
  rest:
    url: http://localhost:8088
    url: http://172.19.103.57:8088
  timer:
      period: 10000
  tenant:
@@ -61,7 +55,7 @@ hos:
    password: ceshi
hzy:
  hello: hello dev !!!
  
---
spring:
@@ -72,7 +66,7 @@ spring:
      password: admin
  data:
    mongodb:
      host: 172.19.103.42 # mongodb 连接信息
      host: 172.19.103.57 # mongodb 连接信息
      port: 27017
      username: esb
      password: esb
@@ -82,18 +76,18 @@ spring:
eureka:
  client:
    serviceUrl:
      defaultZone: http://192.168.1.221:8761/eureka/  # eureka发现服务中心地址
      defaultZone: http://172.19.103.58:8761/eureka/  # eureka发现服务中心地址
log:
  path: /usr/local/esb/logs/hos-broker  #日志输出地址
  path: /data/logs/hos-broker  #日志输出地址
  level: info
hos:
  filesystem:
    url: http://172.19.103.37:9010/dfs/file #文件服务器地址
  arbiter:
    enable: true
    url: http://172.19.103.37:10135  # arbiter 的连接地址
    url: http://172.19.103.57:10135  # arbiter 的连接地址
  rest:
    url: http://172.19.103.37:8088  # 采集上传档案等服务连接地址
    url: http://172.19.103.57:8088  # 采集上传档案等服务连接地址
  timer:
      period: 10000
  tenant:

svr-dfs.yml

@@ -61,7 +61,7 @@ spring:
    password: weifuwu
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
  cluster-nodes: 172.19.103.9:9300
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80

svr-ehr-basic.yml

@@ -184,4 +184,4 @@ fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
eip:
  tenant: jkzl
  tenant: jkzl

svr-health-profile.yml

@@ -103,6 +103,10 @@ spring:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  application:
    id: JKZL

svr-pack-mgr.yml

@@ -108,6 +108,8 @@ spring:
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  metrics:
    export:
      statsd:

svr-pack-resolve.yml

@@ -204,6 +204,8 @@ spring:
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
@@ -334,4 +336,4 @@ fast-dfs:
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,node4.hde.h3c.com

svr-resource.yml

@@ -74,6 +74,8 @@ spring:
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.

svr-standard.yml

@@ -107,6 +107,8 @@ spring:
  redis:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
fast-dfs:
  tracker-server: 172.19.103.13:22122