* 远程绑定feign解耦优化

Mu-L · Jan 10, 2023 · e2d20c0 · e2d20c0
1 parent 764728d
commit e2d20c0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 30 deletions.
diff --git a/diboot-core/pom.xml b/diboot-core/pom.xml
@@ -22,17 +22,18 @@
             <version>4.0.1</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+            <artifactId>spring-jdbc</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -56,24 +57,11 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
-        <!-- openfeign可选依赖 -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-openfeign-core</artifactId>
-            <version>3.1.5</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
-    </dependency>
-    <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>${commons-io.version}</version>
-    </dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
 
     </dependencies>
 

diff --git a/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java b/diboot-core/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingManager.java
@@ -15,12 +15,12 @@
  */
 package com.diboot.core.binding.binder.remote;
 
-import com.diboot.core.util.ContextHelper;
+import com.diboot.core.exception.InvalidUsageException;
+import com.diboot.core.util.ContextHolder;
 import com.diboot.core.util.JSON;
 import com.diboot.core.util.V;
 import com.diboot.core.vo.JsonResult;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cloud.openfeign.FeignClientBuilder;
 
 import java.util.Collections;
 import java.util.List;
@@ -41,10 +41,6 @@ public class RemoteBindingManager {
      * restTemplate 实例缓存
      */
     private static Map<String, RemoteBindingProvider> MODULE_PROVIDER_MAP;
-    /**
-     * feignClientBuilder 实例
-     */
-    private static FeignClientBuilder feignClientBuilder;
 
     /**
      * 从远程接口抓取 Entity List
@@ -78,10 +74,11 @@ private synchronized static RemoteBindingProvider getRemoteBindingProvider(Strin
             MODULE_PROVIDER_MAP = new ConcurrentHashMap<>();
         }
         return MODULE_PROVIDER_MAP.computeIfAbsent(module, key -> {
-            if(feignClientBuilder == null){
-                feignClientBuilder = new FeignClientBuilder(ContextHelper.getApplicationContext());
+            RemoteBindingProviderFactory factory = ContextHolder.getBean(RemoteBindingProviderFactory.class);
+            if(factory == null) {
+                throw new InvalidUsageException("RemoteBindingProviderFactory 未实现，无法使用远程绑定功能！");
             }
-            return feignClientBuilder.forType(RemoteBindingProvider.class, module).build();
+            return factory.create(module);
         });
     }
 

diff --git a/...ore/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingProviderFactory.java b/...ore/src/main/java/com/diboot/core/binding/binder/remote/RemoteBindingProviderFactory.java
@@ -0,0 +1,19 @@
+package com.diboot.core.binding.binder.remote;
+
+/**
+ * 远程绑定工厂类
+ * @author JerryMa
+ * @version v3.0.0
+ * @date 2023/1/10
+ * Copyright © diboot.com
+ */
+public interface RemoteBindingProviderFactory {
+
+    /**
+     * 创建provider实例
+     * @param module
+     * @return
+     */
+    RemoteBindingProvider create(String module);
+
+}