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

application.yml

@@ -4,6 +4,8 @@ logging:
    org:
      apache:
        zookeeper: WARN
        hadoop: WARN
      hibernate: ERROR
#set max http header size
server:
@@ -30,7 +32,12 @@ hystrix:
      execution:
        isolation:
          thread:
            timeoutInMilliseconds: 30000
            timeoutInMilliseconds: 300000
#Ribbon
ribbon:
  ReadTimeout: 300000
  ConnectTimeout: 5000
#Application error definition, this file define common errors,
#if the error is used only in your application, please define it in your application configuration file.
@@ -113,7 +120,7 @@ eureka:
    serviceUrl:
      defaultZone: http://${eureka-server-ip}/eureka/
    healthcheck:
      enabled: true
      enabled: false
---
spring:

hos-admin.yml

@@ -16,7 +16,7 @@ spring:
  profiles: dev
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.19.103.57:8066/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    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
@@ -65,7 +65,7 @@ spring:
  profiles: test
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.19.103.57:8066/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    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