[type:refactor] refactor module

moremind · Nov 13, 2023 · b9b637e · b9b637e
1 parent 5681017
commit b9b637e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/shenyu-admin-listener/shenyu-admin-listener-etcd/pom.xml b/shenyu-admin-listener/shenyu-admin-listener-etcd/pom.xml
@@ -29,6 +29,10 @@
     <artifactId>shenyu-admin-listener-etcd</artifactId>
 
     <dependencies>
+        <dependency>
+            <artifactId>grpc-netty</artifactId>
+            <groupId>io.grpc</groupId>
+        </dependency>
 
         <dependency>
             <groupId>io.etcd</groupId>

diff --git a/shenyu-admin-listener/shenyu-admin-listener-polaris/pom.xml b/shenyu-admin-listener/shenyu-admin-listener-polaris/pom.xml
@@ -45,11 +45,5 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.shenyu</groupId>
-            <artifactId>shenyu-discovery-nacos</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/shenyu-admin/pom.xml b/shenyu-admin/pom.xml
@@ -199,11 +199,6 @@
             <artifactId>protostuff-runtime</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.caucho</groupId>
-            <artifactId>hessian</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
@@ -224,7 +219,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <scope>runtime</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -280,6 +275,7 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
+        <!-- shenyu discovery start -->
         <dependency>
             <groupId>org.apache.shenyu</groupId>
             <artifactId>shenyu-discovery-etcd</artifactId>
@@ -309,9 +305,9 @@
             </exclusions>
             <version>${project.version}</version>
         </dependency>
+        <!-- shenyu discovery end -->
 
-        <!--  shenyu-admin-listener start-->
-
+        <!-- shenyu-admin-listener start -->
         <dependency>
             <groupId>org.apache.shenyu</groupId>
             <artifactId>shenyu-admin-listener-apollo</artifactId>

diff --git a/...min/config/ConsulServerConfiguration.java → ...ver/consul/ConsulServerConfiguration.java b/...min/config/ConsulServerConfiguration.java → ...ver/consul/ConsulServerConfiguration.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shenyu.admin.config;
+package org.apache.shenyu.register.client.server.consul;
 
 import com.ecwid.consul.v1.ConsulClient;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shenyu.common.exception.ShenyuException;
 import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;
-import org.apache.shenyu.register.client.server.consul.ShenyuConsulConfigWatch;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;