Merge remote-tracking branch 'origin/dev' into dev

application.yml

@@ -32,7 +32,7 @@ hystrix:
      execution:
        isolation:
          thread:
            timeoutInMilliseconds: 300000
            timeoutInMilliseconds: 305000
#Ribbon
ribbon:

hos-broker.yml

@@ -25,10 +25,6 @@ spring:
      authenticationDatabase: admin
      database: log
      gridFsDatabase: dfs
eureka:
  client:
    serviceUrl:
      defaultZone: http://172.19.103.58:8761/eureka/
log:
  path: D://logs/logback/dev
@@ -73,10 +69,6 @@ spring:
      authenticationDatabase: admin
      database: log
      gridFsDatabase: dfs
eureka:
  client:
    serviceUrl:
      defaultZone: http://172.19.103.58:8761/eureka/  # eureka发现服务中心地址
log:
  path: /data/logs/hos-broker  #日志输出地址
  level: info
@@ -102,3 +94,46 @@ hos:
    password: ceshi
hzy:
  hello: hello test !!!
---
spring:
  profiles: prod_sr
  activemq:
    broker-url: tcp://10.176.97.5:61616
    user: admin
    password: admin
  data:
    mongodb:
      host: 10.176.97.9
      port: 29000
      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://10.176.97.14:9010/dfs/file
  arbiter:
    enable: true
    url: http://10.176.97.14:10135
  rest:
    url: http://10.176.97.14: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

svr-ehr-basic.yml

@@ -132,6 +132,12 @@ spring:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  ldap:
    host: 172.19.103.87
    port: 389
    bindDn: cn=admin,dc=ehr,dc=jkzl
    password: jkzl
    root: dc=ehr,dc=jkzl
  data:
    mongodb:
      host: 10.176.97.9
@@ -161,6 +167,12 @@ spring:
    url: jdbc:mysql://100.100.1.159:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  ldap:
    host: 172.19.103.87
    port: 389
    bindDn: cn=admin,dc=ehr,dc=jkzl
    password: jkzl
    root: dc=ehr,dc=jkzl
  data:
    mongodb:
      host: 100.100.1.157