From 2a7ec83cd11b811db884e215f94c5ed83fc92bc6 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Wed, 12 Aug 2020 14:51:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-commons/kidgrow-ribbon-spring-boot-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 28349ed..972d448 100644
--- a/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,10 +1,10 @@
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\org\springframework\cloud\netflix\ribbon\DefaultPropertiesFactory.java
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\config\RestTemplateProperties.java
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\FeignAutoConfigure.java
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\filter\LbIsolationFilter.java
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\RestTemplateAutoConfigure.java
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\config\FeignHttpInterceptorConfig.java
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\annotation\EnableBaseFeignInterceptor.java
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\RibbonAutoConfigure.java
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\config\FeignInterceptorConfig.java
-E:\product\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\annotation\EnableFeignInterceptor.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\annotation\EnableBaseFeignInterceptor.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\config\RestTemplateProperties.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\filter\LbIsolationFilter.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\config\FeignInterceptorConfig.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\config\FeignHttpInterceptorConfig.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\RestTemplateAutoConfigure.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\RibbonAutoConfigure.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\annotation\EnableFeignInterceptor.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\com\kidgrow\ribbon\FeignAutoConfigure.java
+E:\product\kidgrow\kidgrow-microservices-platform\kidgrow-microservices-platform\kidgrow-commons\kidgrow-ribbon-spring-boot-starter\src\main\java\org\springframework\cloud\netflix\ribbon\DefaultPropertiesFactory.java

--
Gitblit v1.8.0