From 33f9bbb055e8420b0b3dd32a3d1377e9cdaa02e0 Mon Sep 17 00:00:00 2001 From: wangbing Date: Wed, 3 Sep 2025 17:49:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/xyz/wbsite/achat/OpenAiController.java | 4 ++-- .../java/xyz/wbsite/achat/config/ChatConfig.java | 7 +++++++ .../{ThreadPoolConfig.java => ThreadConfig.java} | 2 +- .../config/{WebMvcConfig.java => WebConfig.java} | 2 +- .../java/xyz/wbsite/achat/core/chat/ChatService.java | 9 ++------- .../achat/core/chat/ChatServiceSampleImpl.java | 12 ++---------- .../core/{chat => embed}/EmbeddingsRequest.java | 7 +------ .../core/{chat => embed}/EmbeddingsResponse.java | 5 ++++- .../achat/core/session/SessionServiceMemoryImpl.java | 3 --- 9 files changed, 20 insertions(+), 31 deletions(-) rename src/main/java/xyz/wbsite/achat/config/{ThreadPoolConfig.java => ThreadConfig.java} (98%) rename src/main/java/xyz/wbsite/achat/config/{WebMvcConfig.java => WebConfig.java} (95%) rename src/main/java/xyz/wbsite/achat/core/{chat => embed}/EmbeddingsRequest.java (88%) rename src/main/java/xyz/wbsite/achat/core/{chat => embed}/EmbeddingsResponse.java (98%) diff --git a/src/main/java/xyz/wbsite/achat/OpenAiController.java b/src/main/java/xyz/wbsite/achat/OpenAiController.java index c23a954..0bc004a 100644 --- a/src/main/java/xyz/wbsite/achat/OpenAiController.java +++ b/src/main/java/xyz/wbsite/achat/OpenAiController.java @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RestController; import xyz.wbsite.achat.core.chat.ChatCompletionRequest; import xyz.wbsite.achat.core.chat.CompletionRequest; import xyz.wbsite.achat.core.chat.CompletionResponse; -import xyz.wbsite.achat.core.chat.EmbeddingsRequest; -import xyz.wbsite.achat.core.chat.EmbeddingsResponse; +import xyz.wbsite.achat.core.embed.EmbeddingsRequest; +import xyz.wbsite.achat.core.embed.EmbeddingsResponse; import xyz.wbsite.achat.core.model.ModelListResponse; import xyz.wbsite.achat.core.chat.ChatService; diff --git a/src/main/java/xyz/wbsite/achat/config/ChatConfig.java b/src/main/java/xyz/wbsite/achat/config/ChatConfig.java index 1394e03..854bb68 100644 --- a/src/main/java/xyz/wbsite/achat/config/ChatConfig.java +++ b/src/main/java/xyz/wbsite/achat/config/ChatConfig.java @@ -5,6 +5,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import xyz.wbsite.achat.core.chat.ChatService; import xyz.wbsite.achat.core.chat.ChatServiceSampleImpl; +import xyz.wbsite.achat.core.session.SessionService; +import xyz.wbsite.achat.core.session.SessionServiceMemoryImpl; /** * 对话配置 @@ -20,4 +22,9 @@ public class ChatConfig implements WebMvcConfigurer { public ChatService chatService() { return new ChatServiceSampleImpl(); } + + @Bean + public SessionService sessionService() { + return new SessionServiceMemoryImpl(); + } } diff --git a/src/main/java/xyz/wbsite/achat/config/ThreadPoolConfig.java b/src/main/java/xyz/wbsite/achat/config/ThreadConfig.java similarity index 98% rename from src/main/java/xyz/wbsite/achat/config/ThreadPoolConfig.java rename to src/main/java/xyz/wbsite/achat/config/ThreadConfig.java index 1d98945..16e7986 100644 --- a/src/main/java/xyz/wbsite/achat/config/ThreadPoolConfig.java +++ b/src/main/java/xyz/wbsite/achat/config/ThreadConfig.java @@ -16,7 +16,7 @@ import java.util.concurrent.ThreadPoolExecutor; * @since 1.8 */ @Configuration -public class ThreadPoolConfig { +public class ThreadConfig { // 获取CPU核心数 private final int cpuCount = Runtime.getRuntime().availableProcessors(); diff --git a/src/main/java/xyz/wbsite/achat/config/WebMvcConfig.java b/src/main/java/xyz/wbsite/achat/config/WebConfig.java similarity index 95% rename from src/main/java/xyz/wbsite/achat/config/WebMvcConfig.java rename to src/main/java/xyz/wbsite/achat/config/WebConfig.java index 86e7d62..67b4b8d 100644 --- a/src/main/java/xyz/wbsite/achat/config/WebMvcConfig.java +++ b/src/main/java/xyz/wbsite/achat/config/WebConfig.java @@ -12,7 +12,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @since 1.8 */ @Configuration -public class WebMvcConfig implements WebMvcConfigurer { +public class WebConfig implements WebMvcConfigurer { /** * 跨域配置 diff --git a/src/main/java/xyz/wbsite/achat/core/chat/ChatService.java b/src/main/java/xyz/wbsite/achat/core/chat/ChatService.java index c34f13c..17fdf73 100644 --- a/src/main/java/xyz/wbsite/achat/core/chat/ChatService.java +++ b/src/main/java/xyz/wbsite/achat/core/chat/ChatService.java @@ -1,13 +1,8 @@ package xyz.wbsite.achat.core.chat; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; -import xyz.wbsite.achat.core.chat.ChatCompletionRequest; -import xyz.wbsite.achat.core.chat.ChatCompletionResponse; -import xyz.wbsite.achat.core.chat.CompletionRequest; -import xyz.wbsite.achat.core.chat.CompletionResponse; -import xyz.wbsite.achat.core.chat.EmbeddingsRequest; -import xyz.wbsite.achat.core.chat.EmbeddingsResponse; -import xyz.wbsite.achat.core.chat.StreamEmitter; +import xyz.wbsite.achat.core.embed.EmbeddingsRequest; +import xyz.wbsite.achat.core.embed.EmbeddingsResponse; public interface ChatService { diff --git a/src/main/java/xyz/wbsite/achat/core/chat/ChatServiceSampleImpl.java b/src/main/java/xyz/wbsite/achat/core/chat/ChatServiceSampleImpl.java index 9f46286..9ffee44 100644 --- a/src/main/java/xyz/wbsite/achat/core/chat/ChatServiceSampleImpl.java +++ b/src/main/java/xyz/wbsite/achat/core/chat/ChatServiceSampleImpl.java @@ -2,16 +2,8 @@ package xyz.wbsite.achat.core.chat; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; -import xyz.wbsite.achat.core.chat.ChatCompletionRequest; -import xyz.wbsite.achat.core.chat.ChatCompletionResponse; -import xyz.wbsite.achat.core.chat.CompletionRequest; -import xyz.wbsite.achat.core.chat.CompletionResponse; -import xyz.wbsite.achat.core.chat.EmbeddingsRequest; -import xyz.wbsite.achat.core.chat.EmbeddingsResponse; -import xyz.wbsite.achat.core.chat.Role; -import xyz.wbsite.achat.core.chat.StreamEmitter; -import xyz.wbsite.achat.core.chat.Usage; -import xyz.wbsite.achat.core.chat.ChatService; +import xyz.wbsite.achat.core.embed.EmbeddingsRequest; +import xyz.wbsite.achat.core.embed.EmbeddingsResponse; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/xyz/wbsite/achat/core/chat/EmbeddingsRequest.java b/src/main/java/xyz/wbsite/achat/core/embed/EmbeddingsRequest.java similarity index 88% rename from src/main/java/xyz/wbsite/achat/core/chat/EmbeddingsRequest.java rename to src/main/java/xyz/wbsite/achat/core/embed/EmbeddingsRequest.java index ed0461f..630eddb 100644 --- a/src/main/java/xyz/wbsite/achat/core/chat/EmbeddingsRequest.java +++ b/src/main/java/xyz/wbsite/achat/core/embed/EmbeddingsRequest.java @@ -1,4 +1,4 @@ -package xyz.wbsite.achat.core.chat; +package xyz.wbsite.achat.core.embed; import java.util.ArrayList; import java.util.List; @@ -15,18 +15,15 @@ public class EmbeddingsRequest { private List input; private String user; - // 无参构造函数 public EmbeddingsRequest() { } - // 私有构造函数,用于Builder模式 private EmbeddingsRequest(Builder builder) { this.model = builder.model; this.input = builder.input; this.user = builder.user; } - // 静态builder方法,返回Builder实例 public static Builder builder() { return new Builder(); } @@ -55,7 +52,6 @@ public class EmbeddingsRequest { this.user = user; } - // Builder内部类 public static class Builder { private String model; private List input = new ArrayList<>(); @@ -81,7 +77,6 @@ public class EmbeddingsRequest { return this; } - // 构建EmbeddingsRequest对象 public EmbeddingsRequest build() { return new EmbeddingsRequest(this); } diff --git a/src/main/java/xyz/wbsite/achat/core/chat/EmbeddingsResponse.java b/src/main/java/xyz/wbsite/achat/core/embed/EmbeddingsResponse.java similarity index 98% rename from src/main/java/xyz/wbsite/achat/core/chat/EmbeddingsResponse.java rename to src/main/java/xyz/wbsite/achat/core/embed/EmbeddingsResponse.java index 18a222b..38ba9c8 100644 --- a/src/main/java/xyz/wbsite/achat/core/chat/EmbeddingsResponse.java +++ b/src/main/java/xyz/wbsite/achat/core/embed/EmbeddingsResponse.java @@ -1,4 +1,6 @@ -package xyz.wbsite.achat.core.chat; +package xyz.wbsite.achat.core.embed; + +import xyz.wbsite.achat.core.chat.Usage; import java.util.ArrayList; import java.util.List; @@ -23,6 +25,7 @@ public class EmbeddingsResponse { * 无参构造函数 */ public EmbeddingsResponse() { + } /** diff --git a/src/main/java/xyz/wbsite/achat/core/session/SessionServiceMemoryImpl.java b/src/main/java/xyz/wbsite/achat/core/session/SessionServiceMemoryImpl.java index 7dbebbb..7057d1d 100644 --- a/src/main/java/xyz/wbsite/achat/core/session/SessionServiceMemoryImpl.java +++ b/src/main/java/xyz/wbsite/achat/core/session/SessionServiceMemoryImpl.java @@ -1,7 +1,5 @@ package xyz.wbsite.achat.core.session; -import org.springframework.stereotype.Service; - import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -15,7 +13,6 @@ import java.util.stream.Collectors; * @version 0.0.1 * @since 1.8 */ -@Service public class SessionServiceMemoryImpl implements SessionService { /**