diff --git a/clouddo-admin/pom.xml b/clouddo-admin/pom.xml
index 3f5f6bfb76db6c5fcd8ee8c0cceadc28bcbaaf7b..823d6930bcfb384ea828a67c0a6796a8daf69feb 100644
--- a/clouddo-admin/pom.xml
+++ b/clouddo-admin/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.9.RELEASE</version>
+		<version>2.0.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,14 +22,14 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Edgware.RELEASE</spring-cloud.version>
+		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
 		<org.mapstruct.version>1.1.0.Final</org.mapstruct.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka-server</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java
index 649536fe7b40b6a8bc7ec3ed3af11917573cb908..997615e268124f4df94cac08fa4b19148d1d4aa6 100644
--- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java
+++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/ClouddoAdminApplication.java
@@ -1,15 +1,18 @@
 package com.bootdo.clouddoadmin;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableFeignClients(basePackages = {"com.bootdo"})
 @EnableCaching
 @EnableScheduling
 @SpringBootApplication(scanBasePackages = {"com.bootdo.clouddoadmin", "com.bootdo.clouddocommon"})
+@EnableAutoConfiguration(exclude = {SecurityAutoConfiguration.class})
 public class ClouddoAdminApplication {
 
     public static void main(String[] args) {
diff --git a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java
index c1e4d8c74da736e402ba94b65db77534ebab187c..092808e17616e446f8dbf5dd326a0be540c4c526 100644
--- a/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java
+++ b/clouddo-admin/src/main/java/com/bootdo/clouddoadmin/rpc/TestRpc.java
@@ -1,13 +1,9 @@
 package com.bootdo.clouddoadmin.rpc;
 
-import com.bootdo.clouddocommon.dto.MenuDTO;
 import com.bootdo.clouddocommon.intercepter.FeignIntercepter;
-import feign.Headers;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import java.util.List;
-
 @FeignClient(name = "course", configuration = FeignIntercepter.class)
 public interface TestRpc {
     @GetMapping("/test/testRpc/test")
diff --git a/clouddo-admin/src/main/resources/application.yml b/clouddo-admin/src/main/resources/application.yml
index b341fd19ae8420abac7a941ba2de3772d3b3614b..f5b1ce1924140dba00758b2bf40f1ecfd171e0e8 100644
--- a/clouddo-admin/src/main/resources/application.yml
+++ b/clouddo-admin/src/main/resources/application.yml
@@ -2,9 +2,9 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://localhost:8001/eureka/
-security:
-  basic:
-    enabled: false
+#security:
+#  basic:
+#    enabled: false
 server:
   port: 8005
 spring:
@@ -21,5 +21,5 @@ mybatis:
   mapper-locations: mapper/**Mapper.xml
   configuration:
       map-underscore-to-camel-case: true
-logging:
-  level: debug
\ No newline at end of file
+#logging:
+#  level: debug
\ No newline at end of file
diff --git a/clouddo-base/pom.xml b/clouddo-base/pom.xml
index 592de6a8ca96abc74dbe480d49ebbd562bd16ca6..6990c63c0b3b9c28131508c99bb1f051df25c032 100644
--- a/clouddo-base/pom.xml
+++ b/clouddo-base/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.9.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -22,13 +22,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Edgware.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Finchley.SR1</spring-cloud.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka-server</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
         </dependency>
 
         <dependency>
diff --git a/clouddo-cms/pom.xml b/clouddo-cms/pom.xml
index 59663cdfcfaa1993fc1ff92b6bb1310a017aecc1..593a6e5739810f9be07f1c67e7df4e911978b0f4 100644
--- a/clouddo-cms/pom.xml
+++ b/clouddo-cms/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.RELEASE</version>
+		<version>2.0.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Finchley.M8</spring-cloud.version>
+		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
diff --git a/clouddo-common/pom.xml b/clouddo-common/pom.xml
index e0120853a243a0f38ad8e5f88e422d1b7179a04b..ec6e2cc391e7f20111bdb0c7d9cf14be6c159183 100644
--- a/clouddo-common/pom.xml
+++ b/clouddo-common/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.9.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -22,7 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Edgware.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Finchley.SR1</spring-cloud.version>
         <org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
     </properties>
 
@@ -34,7 +34,7 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-feign</artifactId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
         <dependency>
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>RELEASE</version>
+            <version>3.7</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java
index e351e7409568f31fd2c26af78c8cba1282f62747..b8ca8f8f4b859ec449f73f4735e14159c85aaaf1 100644
--- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java
+++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/service/LogRpcService.java
@@ -4,7 +4,7 @@ import com.bootdo.clouddocommon.dto.LogDO;
 import com.bootdo.clouddocommon.intercepter.FeignIntercepter;
 import com.bootdo.clouddocommon.utils.R;
 import feign.Headers;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.PostMapping;
 
diff --git a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java
index 4c8800fba666acbf6e4be2d7b302daef929fbeeb..22132cebdabdbdf741a68d1d0313ff136fd4b25a 100644
--- a/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java
+++ b/clouddo-common/src/main/java/com/bootdo/clouddocommon/utils/HttpServletUtils.java
@@ -1,7 +1,5 @@
 package com.bootdo.clouddocommon.utils;
 
-import org.apache.commons.lang.StringUtils;
-
 import javax.servlet.http.HttpServletRequest;
 
 public class HttpServletUtils {
diff --git a/clouddo-server/pom.xml b/clouddo-server/pom.xml
index e72cf0001348b89415e3c003a10e4044ca25d928..a590071aa172274b5db48bfd83444fb4c921d656 100644
--- a/clouddo-server/pom.xml
+++ b/clouddo-server/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.9.RELEASE</version>
+		<version>2.0.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,13 +22,13 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Edgware.RELEASE</spring-cloud.version>
+		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka-server</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/clouddo-zuul/pom.xml b/clouddo-zuul/pom.xml
index 782e980cc4bd785af0fd26b2aa343b90165746e0..15f25a585f3ef8ddea9682849eeec3a164b5e126 100644
--- a/clouddo-zuul/pom.xml
+++ b/clouddo-zuul/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>2.0.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -22,22 +22,22 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Edgware.RELEASE</spring-cloud.version>
+		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-eureka-server</artifactId>
+			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-zuul</artifactId>
+			<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-feign</artifactId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 
 		<dependency>
@@ -59,12 +59,12 @@
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-ribbon</artifactId>
+			<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-hystrix</artifactId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 		</dependency>
 	</dependencies>
 
diff --git a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java
index de6267a58c0d695ce1d6355ce8febbce74eb1fb6..9fb8901e67978a5795762a50ccb1899483a96ac4 100644
--- a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java
+++ b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/ClouddoZuulApplication.java
@@ -4,10 +4,9 @@ import com.bootdo.clouddozuul.filter.AccessFilter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
diff --git a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java
index f015aced7df412ad21c3e48dbb553bd7ec694c8b..9937ca44be9300c090d91ede86fb6d2c9ae166c5 100644
--- a/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java
+++ b/clouddo-zuul/src/main/java/com/bootdo/clouddozuul/prc/admin/MenuService.java
@@ -3,7 +3,7 @@ package com.bootdo.clouddozuul.prc.admin;
 import com.bootdo.clouddocommon.dto.MenuDTO;
 import com.bootdo.clouddocommon.intercepter.FeignIntercepter;
 import feign.Headers;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.List;