Merge branch 'dev' of LiTaohong/wlyy2.0 into dev

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

@@ -41,11 +41,6 @@ eureka:
  client:
    healthcheck:
      enabled: true #监控检查
    serviceUrl:
      defaultZone: http://jw:jkzl@172.26.0.107:8761/eureka/
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
# i健康用户信息接口，开放出来给互联网医院登录同步用户信息用
iHealth:
@@ -65,11 +60,6 @@ eureka:
  client:
    healthcheck:
      enabled: true #监控检查
    serviceUrl:
      defaultZone: http://jw:jkzl@172.26.0.107:8761/eureka/
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
## i健康用户信息接口，开放出来给互联网医院登录同步用户信息用
iHealth:
@@ -91,11 +81,6 @@ eureka:
  client:
    healthcheck:
      enabled: true #监控检查
    serviceUrl:
      defaultZone: http://jw:jkzl@172.26.0.107:8761/eureka/
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
iHealth:
  user-info-uri: http://ehr.yihu.com/wlyy/iHealth/userInfo

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

@@ -16,6 +16,13 @@ spring:
        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}
---
spring:
  profiles: jwtest
@@ -25,6 +32,14 @@ spring:
        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}
---
spring:
  profiles: jwprod
@@ -32,4 +47,12 @@ spring:
    config:
      discovery:
        enabled: true
        service-id: svr-configuration
        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}