From 8d2a5c8d81fcf2d43e37884fb23292f202ccd434 Mon Sep 17 00:00:00 2001
From: shenhongxi <shenhongxi@360.cn>
Date: Fri, 15 Sep 2017 17:14:14 +0800
Subject: [PATCH] application.yml

---
 .../src/main/resources/application.yml        | 20 ++++++++++++++-
 .../src/main/resources/application.yml        | 25 ++++++++++++++++++-
 .../src/main/resources/application.yml        | 20 ++++++++++++++-
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/whatsmars-spring-cloud/whatsmars-springcloud-consumer/src/main/resources/application.yml b/whatsmars-spring-cloud/whatsmars-springcloud-consumer/src/main/resources/application.yml
index 4cdcabc9..d8841865 100644
--- a/whatsmars-spring-cloud/whatsmars-springcloud-consumer/src/main/resources/application.yml
+++ b/whatsmars-spring-cloud/whatsmars-springcloud-consumer/src/main/resources/application.yml
@@ -1,3 +1,20 @@
+spring:
+  profiles:
+    active: dev
+
+---
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://test.toutiao.im:8761/eureka/
+server:
+  port: 8763
+spring:
+  application:
+    name: demo-consumer
+  profiles: test
+
+---
 eureka:
   client:
     serviceUrl:
@@ -6,4 +23,5 @@ server:
   port: 8763
 spring:
   application:
-    name: demo-consumer
\ No newline at end of file
+    name: demo-consumer
+  profiles: dev
\ No newline at end of file
diff --git a/whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/resources/application.yml b/whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/resources/application.yml
index 137a67c5..d0206627 100644
--- a/whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/resources/application.yml
+++ b/whatsmars-spring-cloud/whatsmars-springcloud-eureka/src/main/resources/application.yml
@@ -1,3 +1,26 @@
+spring:
+  profiles:
+    active: dev
+
+---
+spring:
+  profiles: test
+server:
+  port: 8761
+
+eureka:
+  instance:
+    hostname: test.toutiao.im
+  client:
+    registerWithEureka: false
+    fetchRegistry: false
+    serviceUrl:
+#      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
+      defaultZone: http://test.toutiao.im:8761/eureka/
+
+---
+spring:
+  profiles: dev
 server:
   port: 8761
 
@@ -8,4 +31,4 @@ eureka:
     registerWithEureka: false
     fetchRegistry: false
     serviceUrl:
-      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
\ No newline at end of file
+      defaultZone: http://localhost:8761/eureka/
\ No newline at end of file
diff --git a/whatsmars-spring-cloud/whatsmars-springcloud-provider/src/main/resources/application.yml b/whatsmars-spring-cloud/whatsmars-springcloud-provider/src/main/resources/application.yml
index e4ea6f7f..ac91c03f 100644
--- a/whatsmars-spring-cloud/whatsmars-springcloud-provider/src/main/resources/application.yml
+++ b/whatsmars-spring-cloud/whatsmars-springcloud-provider/src/main/resources/application.yml
@@ -1,3 +1,20 @@
+spring:
+  profiles:
+    active: dev
+
+---
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://test.toutiao.im:8761/eureka/
+server:
+  port: 8762
+spring:
+  application:
+    name: demo-provider
+  profiles: test
+
+---
 eureka:
   client:
     serviceUrl:
@@ -6,4 +23,5 @@ server:
   port: 8762
 spring:
   application:
-    name: demo-provider
\ No newline at end of file
+    name: demo-provider
+  profiles: dev
-- 
GitLab