增加路由中心

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/configuration/PluginAutoConfiguration.java

@@ -12,13 +12,10 @@ package com.nepxion.discovery.plugin.framework.configuration;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
 
 import com.nepxion.discovery.plugin.framework.context.PluginContainerInitializedHandler;
 import com.nepxion.discovery.plugin.framework.context.PluginContextAware;
-import com.nepxion.discovery.plugin.framework.controller.PluginRouterController;
 import com.nepxion.discovery.plugin.framework.entity.RuleEntity;
 import com.nepxion.discovery.plugin.framework.event.PluginPublisher;
 import com.nepxion.discovery.plugin.framework.listener.DiscoveryListenerExecutor;
@@ -28,7 +25,6 @@ import com.nepxion.discovery.plugin.framework.listener.impl.IpAddressFilterRegis
 import com.nepxion.discovery.plugin.framework.listener.impl.VersionFilterDiscoveryListener;
 
 @Configuration
-@ComponentScan(basePackages = { "com.nepxion.discovery.plugin.framework.controller" })
 public class PluginAutoConfiguration {
     static {
         System.out.println("");
@@ -45,11 +41,6 @@ public class PluginAutoConfiguration {
     }
 
     @Bean
-    public RestTemplate pluginRestTemplate() {
-        return new RestTemplate();
-    }
-
-    @Bean
     public PluginContainerInitializedHandler pluginContainerInitializedHandler() {
         return new PluginContainerInitializedHandler();
     }
@@ -65,11 +56,6 @@ public class PluginAutoConfiguration {
     }
 
     @Bean
-    public PluginRouterController pluginRouterController() {
-        return new PluginRouterController();
-    }
-
-    @Bean
     public RuleEntity ruleEntity() {
         return new RuleEntity();
     }

discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/RouteEntity.java → discovery-plugin-framework/src/main/java/com/nepxion/discovery/plugin/framework/entity/RouterEntity.java

@@ -20,7 +20,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 import com.nepxion.discovery.plugin.framework.constant.PluginConstant;
 
-public class RouteEntity implements Serializable {
+public class RouterEntity implements Serializable {
     private static final long serialVersionUID = -4480475963615166799L;
 
     private String serviceId;
@@ -28,7 +28,7 @@ public class RouteEntity implements Serializable {
     private String host;
     private int port;
 
-    private List<RouteEntity> nexts = new ArrayList<RouteEntity>();
+    private List<RouterEntity> nexts = new ArrayList<RouterEntity>();
 
     public String getServiceId() {
         return serviceId;
@@ -62,11 +62,11 @@ public class RouteEntity implements Serializable {
         this.port = port;
     }
 
-    public List<RouteEntity> getNexts() {
+    public List<RouterEntity> getNexts() {
         return nexts;
     }
 
-    public void setNexts(List<RouteEntity> nexts) {
+    public void setNexts(List<RouterEntity> nexts) {
         this.nexts = nexts;
     }
 

discovery-plugin-router-center/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <artifactId>discovery-plugin-router-center</artifactId>
+    <name>Nepxion Discovery Plugin Router Center</name>
+    <packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <description>Nepxion Discovery is an enhancement for Spring Cloud Discovery</description>
+    <url>http://www.nepxion.com</url>
+
+    <parent>
+        <groupId>com.nepxion</groupId>
+        <artifactId>discovery</artifactId>
+        <version>2.0.10</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>discovery-plugin-framework</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

discovery-plugin-router-center/src/main/java/com/nepxion/discovery/plugin/routercenter/configuration/RouterAutoConfiguration.java

+package com.nepxion.discovery.plugin.routercenter.configuration;
+
+/**
+ * <p>Title: Nepxion Discovery</p>
+ * <p>Description: Nepxion Discovery</p>
+ * <p>Copyright: Copyright (c) 2017-2050</p>
+ * <p>Company: Nepxion</p>
+ * @author Haojun Ren
+ * @version 1.0
+ */
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+import com.nepxion.discovery.plugin.routercenter.controller.RouterController;
+
+@Configuration
+@ComponentScan(basePackages = { "com.nepxion.discovery.plugin.routercenter.controller" })
+public class RouterAutoConfiguration {
+    @Bean
+    public RestTemplate routerRestTemplate() {
+        return new RestTemplate();
+    }
+
+    @Bean
+    public RouterController routerController() {
+        return new RouterController();
+    }
+}
\ No newline at end of file

discovery-plugin-starter/pom.xml

@@ -24,5 +24,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>discovery-plugin-admin-center</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>discovery-plugin-router-center</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

discovery-plugin-starter/src/main/resources/META-INF/spring.factories

@@ -4,4 +4,5 @@ com.nepxion.discovery.plugin.framework.context.PluginApplicationContextInitializ
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.nepxion.discovery.plugin.framework.configuration.PluginAutoConfiguration,\
 com.nepxion.discovery.plugin.configcenter.configuration.ConfigAutoConfiguration,\
-com.nepxion.discovery.plugin.admincenter.configuration.AdminAutoConfiguration
\ No newline at end of file
+com.nepxion.discovery.plugin.admincenter.configuration.AdminAutoConfiguration,\
+com.nepxion.discovery.plugin.routercenter.configuration.RouterAutoConfiguration
\ No newline at end of file

pom.xml

@@ -14,6 +14,7 @@
         <module>discovery-plugin-framework</module>
         <module>discovery-plugin-config-center</module>
         <module>discovery-plugin-admin-center</module>
+        <module>discovery-plugin-router-center</module>
         <module>discovery-plugin-starter</module>
         <module>discovery-springcloud-example-a</module>
         <module>discovery-springcloud-example-b</module>
@@ -57,6 +58,12 @@
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
+                <artifactId>discovery-plugin-router-center</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
                 <artifactId>discovery-plugin-starter</artifactId>
                 <version>${project.version}</version>
             </dependency>