From 8c8be418c91324754722e1326b33bc0669bc7a49 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Wed, 11 Jan 2023 16:19:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96rest=20client?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/flyfish/rest/core/client/DefaultRestClient.java   | 3 ++-
 .../flyfish/rest/core/factory/HttpClientFactoryBean.java    | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rest-proxy-core/src/main/java/group/flyfish/rest/core/client/DefaultRestClient.java b/rest-proxy-core/src/main/java/group/flyfish/rest/core/client/DefaultRestClient.java
index be4f9c3..04ca93c 100644
--- a/rest-proxy-core/src/main/java/group/flyfish/rest/core/client/DefaultRestClient.java
+++ b/rest-proxy-core/src/main/java/group/flyfish/rest/core/client/DefaultRestClient.java
@@ -3,6 +3,7 @@ package group.flyfish.rest.core.client;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
 import group.flyfish.rest.core.exception.RestClientException;
+import group.flyfish.rest.core.factory.HttpClientFactoryBean;
 import group.flyfish.rest.core.factory.HttpClientProvider;
 import group.flyfish.rest.enums.ResponseType;
 import group.flyfish.rest.utils.JacksonUtil;
@@ -67,6 +68,7 @@ final class DefaultRestClient implements RestClient {
      */
     DefaultRestClient(HttpRequestBase request) {
         this.request = request;
+        this.clientProvider = HttpClientFactoryBean::createSSLClient;
     }
 
     /**
@@ -273,7 +275,6 @@ final class DefaultRestClient implements RestClient {
         return innerExecute();
     }
 
-
     /**
      * 内部执行方法，预处理结果
      *
diff --git a/rest-proxy-core/src/main/java/group/flyfish/rest/core/factory/HttpClientFactoryBean.java b/rest-proxy-core/src/main/java/group/flyfish/rest/core/factory/HttpClientFactoryBean.java
index 5c1db87..3e90f70 100644
--- a/rest-proxy-core/src/main/java/group/flyfish/rest/core/factory/HttpClientFactoryBean.java
+++ b/rest-proxy-core/src/main/java/group/flyfish/rest/core/factory/HttpClientFactoryBean.java
@@ -28,7 +28,7 @@ public final class HttpClientFactoryBean implements FactoryBean<CloseableHttpCli
     // 使用非公平锁
     private final ReentrantLock lock = new ReentrantLock();
     // 客户端实例，单例
-    private static volatile CloseableHttpClient client;
+    private volatile CloseableHttpClient client;
     // 配置，配置没进来就不初始化
     private final RestClientProperties properties;
 
@@ -42,11 +42,11 @@ public final class HttpClientFactoryBean implements FactoryBean<CloseableHttpCli
     }
 
     /**
-     * 不信任的证书请求客户端
+     * 不信任的证书请求客户端（默认客户端）
      *
      * @return 结果
      */
-    private static CloseableHttpClient createSSLClient() {
+    public static CloseableHttpClient createSSLClient() {
         //信任所有
         try {
             SSLContext context = SSLContextBuilder.create().loadTrustMaterial(null, (arg0, arg1) -> true).build();