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

hos-admin.yml

@@ -165,8 +165,8 @@ hos:
  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
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
jwt:
  header: Authorization
  secret: mySecret
@@ -236,3 +236,68 @@ jwt:
  secret: mySecret
  expiration: 604800
  tokenHead: "Bearer "
---
spring:
  profiles: prod_fz
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://11.1.2.5:3310/tenant_jkzl?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: 11.1.2.22 # Redis server host.
    port: 6390
    password: Kb6wKDQP1W4
    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: 11.1.2.3
      port: 20000
      username: jkzlesb
      password: fgu$^ezl
      authenticationDatabase: admin
      gridFsDatabase: dfs
      database: runtime
  aop:
    proxy-target-class: true
hos:
  saasAdmin: jkzl #SAAS管理员账号,暂时配置在此处
  clientId: 0e3DIdNaQ2
  zbus:
    url: 11.1.2.13:9020
  filesystem:
    url: http://11.1.2.13:9010/dfs/file
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
jwt:
  header: Authorization
  secret: mySecret
  expiration: 604800
  tokenHead: "Bearer "

hos-broker.yml

@@ -137,3 +137,45 @@ hos:
  https:
    enable: false
---
spring:
  profiles: prod_fz
  activemq:
    broker-url: tcp://10.176.97.5:61616  #todo cyx
    user: admin
    password: admin
  data:
    mongodb:
      host: 11.1.2.3
      port: 20000
      username: jkzlesb
      password: fgu$^ezl
      authenticationDatabase: admin
      database: log
      gridFsDatabase: dfs
log:
  path: /usr/local/esb/logs/hos-broker
  level: info
hos:
  filesystem:
    url: http://11.1.2.13:9010/dfs/file
  arbiter:
    enable: true
    url: http://11.1.2.13:10135
  rest:
    url: http://11.1.2.13:8088
  timer:
      period: 10000
  tenant:
    name: jkzl
  mycat:
    path: /usr/local/mycat/   ##mycat的安装目录
  #jcraft shell操作
  jcraft:
    host: 10.176.97.14
    port: 22
    user: root
    password: ceshi
  https:
    enable: false