From f5f3e0286d4fb69f371937bbe1bd7510acc52cfc Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sun, 29 Mar 2020 15:35:05 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E5=A4=9A=E5=9B=A2?=
 =?UTF-8?q?=E9=98=9F=E5=8D=8F=E4=BD=9C=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-gateway/pom.xml                                  |  4 ++++
 blade-gateway/src/main/resources/application-dev.yml   | 10 ++++++++++
 blade-service/blade-demo/pom.xml                       |  4 ----
 .../blade-demo/src/main/resources/application-dev.yml  |  9 ---------
 .../blade-demo/src/test/resources/application.yml      |  9 ---------
 5 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 blade-gateway/src/main/resources/application-dev.yml

diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index cc43a3568..7f4f2f21e 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -40,6 +40,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-ribbon</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-jwt</artifactId>
diff --git a/blade-gateway/src/main/resources/application-dev.yml b/blade-gateway/src/main/resources/application-dev.yml
new file mode 100644
index 000000000..05b6e03e4
--- /dev/null
+++ b/blade-gateway/src/main/resources/application-dev.yml
@@ -0,0 +1,10 @@
+blade:
+  #多团队协作服务配置
+  ribbon:
+    rule:
+      #开启配置
+      enabled: true
+      #负载均衡优先调用的ip段
+      prior-ip-pattern:
+        - 192.168.0.*
+        - 127.0.0.1
diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml
index 84d0ec1dc..5f99a8c0d 100644
--- a/blade-service/blade-demo/pom.xml
+++ b/blade-service/blade-demo/pom.xml
@@ -21,10 +21,6 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-starter-ribbon</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
diff --git a/blade-service/blade-demo/src/main/resources/application-dev.yml b/blade-service/blade-demo/src/main/resources/application-dev.yml
index 5da74d678..38426fa15 100644
--- a/blade-service/blade-demo/src/main/resources/application-dev.yml
+++ b/blade-service/blade-demo/src/main/resources/application-dev.yml
@@ -2,15 +2,6 @@
 server:
   port: 8200
 
-#多团队协作服务配置
-blade:
-  ribbon:
-    rule:
-      #负载均衡优先调用的ip段
-      prior-ip-pattern:
-        - 192.168.0.*
-        - 127.0.0.1
-
 #数据源配置
 #spring:
 #  datasource:
diff --git a/blade-service/blade-demo/src/test/resources/application.yml b/blade-service/blade-demo/src/test/resources/application.yml
index 05817e960..38326ec6f 100644
--- a/blade-service/blade-demo/src/test/resources/application.yml
+++ b/blade-service/blade-demo/src/test/resources/application.yml
@@ -10,15 +10,6 @@ swagger:
     - org.springbalde
     - com.example
 
-#多团队协作服务配置
-blade:
-  ribbon:
-    rule:
-      #负载均衡优先调用的ip段
-      prior-ip-pattern:
-        - 192.168.0.*
-        - 127.0.0.1
-
 #oss配置
 oss:
   enable: true