From 9a8c4c1d7a35c01844eff8579e9b03fe5c68dc00 Mon Sep 17 00:00:00 2001
From: "wangiegie@gmail.com" <wangiegie@gmail.com>
Date: Sun, 24 Dec 2017 20:54:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E5=85=AC=E5=85=B1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=88=B0config-server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/bootstrap.yml          | 30 ++++++++++++------
 .../src/main/resources/bootstrap.yml          | 30 +++++++++++++-----
 pig-config/src/main/resources/application.yml | 20 +++++++++---
 pig-gateway/src/main/resources/bootstrap.yml  | 31 ++++++++++++++-----
 pom.xml                                       |  7 +++++
 5 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/pig-admin-service/src/main/resources/bootstrap.yml b/pig-admin-service/src/main/resources/bootstrap.yml
index 42fdf3a6..5e83ed5a 100644
--- a/pig-admin-service/src/main/resources/bootstrap.yml
+++ b/pig-admin-service/src/main/resources/bootstrap.yml
@@ -1,21 +1,33 @@
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    serviceUrl:
-      defaultZone: http://pig:gip6666@pig-eureka:1025/eureka
-
 spring:
   application:
     name: pig-admin-service
+  profiles:
+    active: dev
   cloud:
     config:
       fail-fast: true
       discovery:
         service-id: pig-config-server
         enabled: true
-      profile: local
+      profile: ${spring.profiles.active}
       label: master
 
+---
+spring:
+  profiles: dev
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      defaultZone: http://pig:gip6666@localhost:1025/eureka
 
-
+---
+spring:
+  profiles: prd
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      defaultZone: http://pig:gip6666@pig-eureka:1025/eureka
diff --git a/pig-auth-service/src/main/resources/bootstrap.yml b/pig-auth-service/src/main/resources/bootstrap.yml
index 605f6290..9f66c1cc 100644
--- a/pig-auth-service/src/main/resources/bootstrap.yml
+++ b/pig-auth-service/src/main/resources/bootstrap.yml
@@ -1,19 +1,33 @@
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    serviceUrl:
-      defaultZone: http://pig:gip6666@pig-eureka:1025/eureka
-
 spring:
   application:
     name: pig-auth-service
+  profiles:
+    active: dev
   cloud:
     config:
       fail-fast: true
       discovery:
         service-id: pig-config-server
         enabled: true
-      profile: local
+      profile: ${spring.profiles.active}
       label: master
 
+---
+spring:
+  profiles: dev
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      defaultZone: http://pig:gip6666@localhost:1025/eureka
+
+---
+spring:
+  profiles: prd
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      defaultZone: http://pig:gip6666@pig-eureka:1025/eureka
diff --git a/pig-config/src/main/resources/application.yml b/pig-config/src/main/resources/application.yml
index 6c8798b4..47b119be 100644
--- a/pig-config/src/main/resources/application.yml
+++ b/pig-config/src/main/resources/application.yml
@@ -4,18 +4,28 @@ server:
 spring:
   application:
     name: pig-config-server
+  profiles:
+    active: dev
   cloud:
     config:
       server:
         git:
           uri: https://github.com/jieblog/pig-config.git
-    bus:
-      trace:
-        enabled: true
-
+---
+spring:
+  profiles: dev
 eureka:
   instance:
     prefer-ip-address: true
   client:
     serviceUrl:
-      defaultZone: http://pig:gip6666@pig-eureka:1025/eureka
\ No newline at end of file
+      defaultZone: http://pig:gip6666@localhost:1025/eureka
+---
+spring:
+  profiles: prd
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      defaultZone: http://pig:gip6666@pig-eureka:1025/eureka
diff --git a/pig-gateway/src/main/resources/bootstrap.yml b/pig-gateway/src/main/resources/bootstrap.yml
index 4b24593e..ae96fb4a 100644
--- a/pig-gateway/src/main/resources/bootstrap.yml
+++ b/pig-gateway/src/main/resources/bootstrap.yml
@@ -1,18 +1,33 @@
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    serviceUrl:
-      defaultZone: http://pig:gip6666@pig-eureka:1025/eureka
-
 spring:
   application:
     name: pig-gateway
+  profiles:
+    active: dev
   cloud:
     config:
       fail-fast: true
       discovery:
         service-id: pig-config-server
         enabled: true
-      profile: local
+      profile: ${spring.profiles.active}
       label: master
+
+---
+spring:
+  profiles: dev
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      defaultZone: http://pig:gip6666@localhost:1025/eureka
+
+---
+spring:
+  profiles: prd
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      defaultZone: http://pig:gip6666@pig-eureka:1025/eureka
diff --git a/pom.xml b/pom.xml
index d1112593..52c91041 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,13 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>io.spring.platform</groupId>
+                <artifactId>platform-bom</artifactId>
+                <version>Brussels-SR6</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>