Merge branch 'jwdev' of trick9191/wlyy2.0.config into jwdev

svr-authentication.yml

@@ -1,5 +1,7 @@
server:
  port: ${server.svr-authentication-port}
  port: 10260
spring:
  datasource:
@@ -23,23 +25,22 @@ user:
  tryLoginTimes: 5 #失败重试次数
#logging:
#  level:
#    org:
#      springframework:
#        security: DEBUG
---
spring:
  profiles: jwdev
  ##发现服务
  datasource:
    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: jkzlehr
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
#    password: jkzl_ehr
eureka:
  client:
    healthcheck:
      enabled: true #监控检查
# i健康用户信息接口，开放出来给互联网医院登录同步用户信息用
iHealth:
@@ -54,6 +55,12 @@ spring:
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
  ##发现服务
eureka:
  client:
    healthcheck:
      enabled: true #监控检查
## i健康用户信息接口，开放出来给互联网医院登录同步用户信息用
iHealth:
  user-info-uri: http://ehr.yihu.com/wlyy/iHealth/userInfo
@@ -68,5 +75,12 @@ spring:
    host: 192.0.33.26 # Redis server host.
    port: 6390 # Redis server port.
    password: Kb6wKDQP1W4
  ##发现服务
eureka:
  client:
    healthcheck:
      enabled: true #监控检查
iHealth:
  user-info-uri: http://ehr.yihu.com/wlyy/iHealth/userInfo