Merge remote-tracking branch 'origin/V28.0_resove_feign_thread_20240929' into…

performance-api/pom.xml

@@ -55,6 +55,11 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-okhttp</artifactId>
+        </dependency>
+
     </dependencies>
 
 

performance-api/src/main/java/com/clx/performance/feign/PerformanceClientConfiguration.java

 package com.clx.performance.feign;
 
-import feign.Request;
+import okhttp3.ConnectionPool;
+import okhttp3.OkHttpClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.concurrent.TimeUnit;
+
 @Configuration
 public class PerformanceClientConfiguration {
 
     @Bean
-    public Request.Options requestOptions() {
-        return new Request.Options(5000, 5000);
+    public ConnectionPool pool() {
+        // 最大连接数、连接存活时间、存活时间单位（分钟）
+        return new ConnectionPool(500, 5, TimeUnit.MINUTES);
+    }
+
+    @Bean
+    public OkHttpClient okHttpClient() {
+        return new OkHttpClient.Builder()
+                .connectionPool(pool()) // 使用自定义连接池
+                .connectTimeout(5L, TimeUnit.SECONDS) // 连接超时时间
+                .readTimeout(5L, TimeUnit.SECONDS) // 读取超时时间
+                .followRedirects(true) // 是否允许重定向
+                .build();
     }
 }
\ No newline at end of file

performance-web/pom.xml

@@ -358,6 +358,7 @@
             <groupId>com.msl.message</groupId>
             <artifactId>message-sdk</artifactId>
         </dependency>
+
     </dependencies>
 
 

performance-web/src/main/java/com/clx/performance/controller/temp/TempFeignController.java

+package com.clx.performance.controller.temp;
+
+import com.clx.order.feign.OrderFeign;
+import com.msl.common.result.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 临时接口
+ * @Date: 2023-8-21 12:10:16
+ * @Version: 1.0
+ */
+@Slf4j
+@RestController
+@RequestMapping(value="/temp/feign")
+@AllArgsConstructor
+public class TempFeignController {
+
+    private OrderFeign orderFeign;
+
+    @ApiOperation(value = "测试feign", notes = "<br>By:刘海泉")
+    @GetMapping("/replaceFeignHttp")
+    public Result<Object> replaceFeignHttp() {
+
+        orderFeign.testFeignHttp();
+
+        return Result.ok();
+    }
+
+}