diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerAutoConfiguration.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerAutoConfiguration.java index 310ea422..45cca721 100644 --- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerAutoConfiguration.java +++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerAutoConfiguration.java @@ -68,7 +68,7 @@ public class EurekaServerAutoConfiguration implements ServletContextAware, private boolean running; - private int order = 0; + private int order = 1; @Override public void setServletContext(ServletContext servletContext) { diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/EnableZuulProxy.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/EnableZuulProxy.java index a938b665..ac52598e 100644 --- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/EnableZuulProxy.java +++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/EnableZuulProxy.java @@ -3,10 +3,12 @@ package org.springframework.platform.netflix.zuul; import java.lang.annotation.*; import org.springframework.context.annotation.Import; +import org.springframework.platform.netflix.eureka.EnableEurekaClient; /** * @author Spencer Gibb */ +@EnableEurekaClient @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/Routes.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/Routes.java index 41c83f50..9028b6f1 100644 --- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/Routes.java +++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/Routes.java @@ -26,7 +26,7 @@ public class Routes { private String keyPrefix; public Routes() { - keyPrefix = "zuul.route."; + keyPrefix = "zuul.proxy.route."; initField(); } diff --git a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java index 7a2912b4..184afd47 100644 --- a/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java +++ b/spring-platform-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java @@ -53,7 +53,7 @@ public class ZuulProxyConfiguration { @Bean Routes routes() { - return new Routes("zuul.proxy.route."); + return new Routes(); } @Bean