升级到F版

discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/endpoint/RouterEndpoint.java

@@ -39,7 +39,6 @@ import org.springframework.web.client.RestTemplate;
 
 import com.nepxion.discovery.plugin.framework.adapter.PluginAdapter;
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
-import com.nepxion.discovery.plugin.framework.context.PluginContainerInitializedHandler;
 import com.nepxion.discovery.plugin.framework.entity.RouterEntity;
 import com.nepxion.discovery.plugin.framework.exception.PluginException;
 
@@ -48,9 +47,6 @@ import com.nepxion.discovery.plugin.framework.exception.PluginException;
 @ManagedResource(description = "Router Endpoint")
 public class RouterEndpoint implements MvcEndpoint {
     @Autowired
-    private PluginContainerInitializedHandler pluginContainerInitializedHandler;
-
-    @Autowired
     private PluginAdapter pluginAdapter;
 
     @Autowired

discovery-springcloud-example-console/pom.xml

@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-eureka</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
 
         <!-- <dependency>

discovery-springcloud-example/pom.xml

@@ -46,12 +46,12 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-feign</artifactId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zuul</artifactId>
+            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
         </dependency>
     </dependencies>
 

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/DiscoveryApplicationA1.java

@@ -12,7 +12,7 @@ package com.nepxion.discovery.plugin.example;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 
 import com.nepxion.discovery.plugin.example.adapter.DiscoveryConfigAdapter;

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/DiscoveryApplicationA2.java

@@ -12,7 +12,7 @@ package com.nepxion.discovery.plugin.example;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableDiscoveryClient

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/DiscoveryApplicationB1.java

@@ -12,7 +12,7 @@ package com.nepxion.discovery.plugin.example;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableDiscoveryClient

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/DiscoveryApplicationB2.java

@@ -12,7 +12,7 @@ package com.nepxion.discovery.plugin.example;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableDiscoveryClient

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/DiscoveryApplicationC1.java

@@ -12,7 +12,7 @@ package com.nepxion.discovery.plugin.example;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableDiscoveryClient

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/DiscoveryApplicationC2.java

@@ -12,7 +12,7 @@ package com.nepxion.discovery.plugin.example;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableDiscoveryClient

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/DiscoveryApplicationC3.java

@@ -12,7 +12,7 @@ package com.nepxion.discovery.plugin.example;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableDiscoveryClient

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/feign/AFeign.java

@@ -9,7 +9,7 @@ package com.nepxion.discovery.plugin.example.feign;
  * @version 1.0
  */
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/feign/BFeign.java

@@ -9,7 +9,7 @@ package com.nepxion.discovery.plugin.example.feign;
  * @version 1.0
  */
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

discovery-springcloud-example/src/main/java/com/nepxion/discovery/plugin/example/feign/CFeign.java

@@ -9,7 +9,7 @@ package com.nepxion.discovery.plugin.example.feign;
  * @version 1.0
  */
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;