From e6c7422c00afb6c967251079aadc859bdf091e2a Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 2 Jan 2015 16:06:48 +0000 Subject: [PATCH] Use <@spring.url/> for all relative paths in FTL Fixes gh-125 --- .../netflix/eureka/server/EurekaController.java | 15 +++------------ .../src/main/resources/templates/eureka/lastn.ftl | 3 ++- .../main/resources/templates/eureka/status.ftl | 3 ++- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java index 70a1d11f0..47b24254b 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java @@ -80,18 +80,9 @@ public class EurekaController { } protected void populateBase(HttpServletRequest request, Map model) { - String contextPath = serverProperties.getContextPath(); - String path = (contextPath == null) ? "" : contextPath + serverProperties.getServletPath(); - path = path.replace("//", "/"); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path; - - if (!basePath.endsWith("/")) { - basePath += "/"; - } - - model.put("time", new Date()); - model.put("basePath", basePath); - model.put("dashboardPath", dashboardPath); + model.put("time", new Date()); + model.put("basePath", "/"); + model.put("dashboardPath", dashboardPath.equals("/") ? "" : dashboardPath); populateHeader(model); diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl index 31ad8c0c1..96521cc51 100644 --- a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl +++ b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/lastn.ftl @@ -1,10 +1,11 @@ +<#import "/spring.ftl" as spring /> - + Eureka - Last N events diff --git a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/status.ftl b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/status.ftl index 1642c72dc..b87cce0ff 100755 --- a/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/status.ftl +++ b/spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/status.ftl @@ -1,10 +1,11 @@ +<#import "/spring.ftl" as spring /> - + Eureka