diff --git a/Chapter9-1-1/eureka-server/pom.xml b/Chapter9-1-1/eureka-server/pom.xml index 770fb70..3f01c31 100644 --- a/Chapter9-1-1/eureka-server/pom.xml +++ b/Chapter9-1-1/eureka-server/pom.xml @@ -12,9 +12,10 @@ Spring Cloud project - org.springframework.cloud - spring-cloud-starter-parent - 1.0.0.RELEASE + org.springframework.boot + spring-boot-starter-parent + 1.3.5.RELEASE + @@ -25,8 +26,9 @@ - org.springframework.cloud - spring-cloud-starter + org.springframework.boot + spring-boot-starter-test + test @@ -35,6 +37,18 @@ + + + + + org.springframework.cloud + spring-cloud-dependencies + Brixton.RELEASE + pom + import + + + diff --git a/Chapter9-1-1/eureka-server/src/main/java/com/didispace/Application.java b/Chapter9-1-1/eureka-server/src/main/java/com/didispace/Application.java index 27e47f5..d3133f6 100755 --- a/Chapter9-1-1/eureka-server/src/main/java/com/didispace/Application.java +++ b/Chapter9-1-1/eureka-server/src/main/java/com/didispace/Application.java @@ -4,8 +4,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; -@SpringBootApplication @EnableEurekaServer +@SpringBootApplication public class Application { public static void main(String[] args) { diff --git a/Chapter9-1-1/eureka-server/src/main/resources/application.properties b/Chapter9-1-1/eureka-server/src/main/resources/application.properties new file mode 100644 index 0000000..0f784a1 --- /dev/null +++ b/Chapter9-1-1/eureka-server/src/main/resources/application.properties @@ -0,0 +1,6 @@ +server.port=1111 + +#eureka.instance.hostname=localhost + +eureka.client.register-with-eureka=false +eureka.client.fetch-registry=false \ No newline at end of file diff --git a/Chapter9-1-1/eureka-server/src/main/resources/application.yml b/Chapter9-1-1/eureka-server/src/main/resources/application.yml deleted file mode 100755 index 75c344e..0000000 --- a/Chapter9-1-1/eureka-server/src/main/resources/application.yml +++ /dev/null @@ -1,12 +0,0 @@ -# 配置应用服务器(Tomcat) -server: - port: 1111 # HTTP端口 - -# 配置发现服务器(Discovery Server) -eureka: - instance: - hostname: localhost - client: # 不是客户端,所以不注册自己 - registerWithEureka: false - fetchRegistry: false -