From d4d5aede31c1a81ac4753cdb7c33dbc854fbda16 Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Sat, 14 Jun 2025 17:45:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(ai):=20restClient=E5=92=8CwebClient?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=BB=99=E5=85=B6=E4=BB=96=E7=B1=BB=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service-ai/bin/build-ai-core.js               | 12 +++++++++
 .../service/ai/chat/TestSpringAiTools.java    | 26 +++----------------
 .../configuration/WebClientConfiguration.java | 24 +++++++++++------
 3 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 service-ai/bin/build-ai-core.js

diff --git a/service-ai/bin/build-ai-core.js b/service-ai/bin/build-ai-core.js
new file mode 100644
index 0000000..254847a
--- /dev/null
+++ b/service-ai/bin/build-ai-core.js
@@ -0,0 +1,12 @@
+import {cd, path} from 'zx'
+import {trim} from "licia";
+import {run_deploy} from '../../bin/library.js'
+
+// 切换目录
+cd(trim(path.dirname(import.meta.dirname)))
+// 执行流程
+try {
+  await run_deploy('service-ai-core')
+} catch (e) {
+  console.error(e)
+}
\ No newline at end of file
diff --git a/service-ai/service-ai-chat/src/test/java/com/lanyuanxiaoyao/service/ai/chat/TestSpringAiTools.java b/service-ai/service-ai-chat/src/test/java/com/lanyuanxiaoyao/service/ai/chat/TestSpringAiTools.java
index 290a4a5..d9f7dc0 100644
--- a/service-ai/service-ai-chat/src/test/java/com/lanyuanxiaoyao/service/ai/chat/TestSpringAiTools.java
+++ b/service-ai/service-ai-chat/src/test/java/com/lanyuanxiaoyao/service/ai/chat/TestSpringAiTools.java
@@ -1,17 +1,13 @@
 package com.lanyuanxiaoyao.service.ai.chat;
 
 import cn.hutool.core.util.StrUtil;
-import java.net.http.HttpClient;
+import com.lanyuanxiaoyao.service.ai.core.configuration.WebClientConfiguration;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.openai.OpenAiChatModel;
 import org.springframework.ai.openai.OpenAiChatOptions;
 import org.springframework.ai.openai.api.OpenAiApi;
 import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.ai.tool.annotation.ToolParam;
-import org.springframework.http.client.JdkClientHttpRequestFactory;
-import org.springframework.http.client.reactive.JdkClientHttpConnector;
-import org.springframework.web.client.RestClient;
-import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.Disposable;
 
 /**
@@ -26,8 +22,8 @@ public class TestSpringAiTools {
                     OpenAiApi.builder()
                         .baseUrl("http://132.121.206.65:10086")
                         .apiKey("*XMySqV%>hR&v>>g*NwCs3tpQ5FVMFEF2VHVTj<MYQd$&@$sY7CgqNyea4giJi4")
-                        .restClientBuilder(restClientBuilder())
-                        .webClientBuilder(webClientBuilder())
+                        .restClientBuilder(WebClientConfiguration.generateRestClientBuilder())
+                        .webClientBuilder(WebClientConfiguration.generateWebClientBuilder())
                         .build()
                 )
                 .defaultOptions(
@@ -48,22 +44,6 @@ public class TestSpringAiTools {
     }
   }
 
-  private static HttpClient httpClient() {
-    return HttpClient.newBuilder()
-        .version(HttpClient.Version.HTTP_1_1)
-        .build();
-  }
-
-  private static RestClient.Builder restClientBuilder() {
-    return RestClient.builder()
-        .requestFactory(new JdkClientHttpRequestFactory(httpClient()));
-  }
-
-  private static WebClient.Builder webClientBuilder() {
-    return WebClient.builder()
-        .clientConnector(new JdkClientHttpConnector(httpClient()));
-  }
-
   public static final class TestTool {
     @Tool(description = "传入任意动物名称，返回一个关于这个动物的笑话")
     public String submit(@ToolParam(description = "动物名称") String animalName) {
diff --git a/service-ai/service-ai-core/src/main/java/com/lanyuanxiaoyao/service/ai/core/configuration/WebClientConfiguration.java b/service-ai/service-ai-core/src/main/java/com/lanyuanxiaoyao/service/ai/core/configuration/WebClientConfiguration.java
index afcddb1..b6338f6 100644
--- a/service-ai/service-ai-core/src/main/java/com/lanyuanxiaoyao/service/ai/core/configuration/WebClientConfiguration.java
+++ b/service-ai/service-ai-core/src/main/java/com/lanyuanxiaoyao/service/ai/core/configuration/WebClientConfiguration.java
@@ -17,22 +17,30 @@ import org.springframework.web.reactive.function.client.WebClient;
  */
 @Configuration
 public class WebClientConfiguration {
-  private HttpClient httpClient() {
-    return HttpClient.newBuilder()
-        .version(HttpClient.Version.HTTP_1_1)
-        .build();
-  }
-
   @Bean
   @Primary
   public RestClient.Builder restClientBuilder() {
-    return RestClient.builder()
-        .requestFactory(new JdkClientHttpRequestFactory(httpClient()));
+    return generateRestClientBuilder();
   }
 
   @Bean
   @Primary
   public WebClient.Builder webClientBuilder() {
+    return generateWebClientBuilder();
+  }
+
+  private static HttpClient httpClient() {
+    return HttpClient.newBuilder()
+        .version(HttpClient.Version.HTTP_1_1)
+        .build();
+  }
+
+  public static RestClient.Builder generateRestClientBuilder() {
+    return RestClient.builder()
+        .requestFactory(new JdkClientHttpRequestFactory(httpClient()));
+  }
+
+  public static WebClient.Builder generateWebClientBuilder() {
     return WebClient.builder()
         .clientConnector(new JdkClientHttpConnector(httpClient()));
   }