Browse Source

Merge branch 'dev' of lyr/ehr.config into dev

sand 8 years ago
parent
commit
75ef09f7ff
2 changed files with 3 additions and 3 deletions
  1. 1 1
      application.yml
  2. 2 2
      svr-health-profile.yml

+ 1 - 1
application.yml

@ -135,7 +135,7 @@ eureka:
  instance:
    prefer-ip-address: false
eureka-server-ip: 172.19.103.11:8761
eureka-server-ip: localhost:8761
---
spring:

+ 2 - 2
svr-health-profile.yml

@ -81,7 +81,7 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.52:80
  public-server: http://172.19.103.54:80
---
spring:
@ -105,7 +105,7 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.52:80
  public-server: http://172.19.103.54:80
  
---
spring: