Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

server/svr-authentication/src/main/resources/application.yml

@@ -2,7 +2,6 @@ server:
  port: 10260
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
@@ -24,7 +23,6 @@ user:
  reflashFailedCountTime: 5 #将失败次数重置为0
  tryLoginTimes: 5 #失败重试次数
---
spring:
  profiles: jwdev
@@ -37,11 +35,6 @@ spring:
    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
@@ -56,10 +49,6 @@ spring:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
  ##发现服务
eureka:
  client:
    healthcheck:
      enabled: true #监控检查
## i健康用户信息接口，开放出来给互联网医院登录同步用户信息用
iHealth:
@@ -77,10 +66,5 @@ spring:
    password: Kb6wKDQP1W4
  ##发现服务
eureka:
  client:
    healthcheck:
      enabled: true #监控检查
iHealth:
  user-info-uri: http://ehr.yihu.com/wlyy/iHealth/userInfo

server/svr-authentication/src/main/resources/bootstrap.yml

@@ -12,47 +12,19 @@ spring:
  profiles: jwdev
  cloud:
    config:
      discovery:
        enabled: true
        service-id: svr-configuration
eureka:
  client:
    serviceUrl:
      defaultZone: http://jw:jkzl@172.26.0.107:8761/eureka/
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
      uri: ${wlyy.spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: jwtest
  cloud:
    config:
      discovery:
        enabled: true
        service-id: svr-configuration
eureka:
  client:
    serviceUrl:
      defaultZone: http://jw:jkzl@172.26.0.107:8761/eureka/
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
      uri: ${wlyy.spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: jwprod
  cloud:
    config:
      discovery:
        enabled: true
        service-id: svr-configuration
eureka:
  client:
    serviceUrl:
      defaultZone: http://jw:jkzl@172.26.0.107:8761/eureka/
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
      uri: ${wlyy.spring.config.uri:http://192.0.33.26:1221}
      label: ${wlyy.spring.config.label:master}