From cb85acd6b8d9d9422a1f8de6213b6cdd963dbffe Mon Sep 17 00:00:00 2001
From: yanghaojie <13486032976@163.com>
Date: Wed, 4 Mar 2020 10:19:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0.gitignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .idea/.gitignore

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..c3b9776
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,7 @@
+# Default ignored files
+/workspace.xml
+
+/misc.xml
+/modules.xml
+/SpringCloudLearning.iml
+/vcs.xml
-- 
Gitee


From 57b491949150a5403c3d92a40d4b11b349e84803 Mon Sep 17 00:00:00 2001
From: yanghaojie <13486032976@163.com>
Date: Wed, 4 Mar 2020 10:55:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ribbon=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                                           | 4 ++++
 springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/.idea/.gitignore b/.idea/.gitignore
index c3b9776..5ecbb78 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -5,3 +5,7 @@
 /modules.xml
 /SpringCloudLearning.iml
 /vcs.xml
+/libraries/
+/.name
+/encodings.xml
+/compiler.xml
diff --git a/springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml b/springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml
index 70fe5b0..f48328a 100644
--- a/springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml
+++ b/springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml
@@ -42,6 +42,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-ribbon</artifactId>
+			<version>1.4.7.RELEASE</version>
 		</dependency>
 
 		<dependency>
-- 
Gitee


From fd61da7e153d50dcf15ac8b7ed985c421d704b9d Mon Sep 17 00:00:00 2001
From: yanghaojie <13486032976@163.com>
Date: Thu, 5 Mar 2020 23:21:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8spring-cloud-starter-netf?=
 =?UTF-8?q?lix-ribbon=EF=BC=8C=E6=9B=BF=E4=BB=A3spring-cloud-starter-ribbo?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 springcloud-alibaba/nacos-config/nacos-consumer/pom.xml    | 2 +-
 springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/springcloud-alibaba/nacos-config/nacos-consumer/pom.xml b/springcloud-alibaba/nacos-config/nacos-consumer/pom.xml
index 70fe5b0..a98eed9 100644
--- a/springcloud-alibaba/nacos-config/nacos-consumer/pom.xml
+++ b/springcloud-alibaba/nacos-config/nacos-consumer/pom.xml
@@ -41,7 +41,7 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-ribbon</artifactId>
+			<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml b/springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml
index f48328a..a98eed9 100644
--- a/springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml
+++ b/springcloud-alibaba/nacos-discovery/nacos-consumer/pom.xml
@@ -41,8 +41,7 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-ribbon</artifactId>
-			<version>1.4.7.RELEASE</version>
+			<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
 		</dependency>
 
 		<dependency>
-- 
Gitee