Merge pull request #1 from ageerle/main

Albert

2025-05-13 3666157d14201d39a0e61588582fee97fac95ad1

 ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java

@@ -8,7 +8,9 @@
import lombok.extern.slf4j.Slf4j;
import okhttp3.ResponseBody;
import org.ruoyi.chat.enums.ChatModeType;
import org.ruoyi.chat.factory.ChatServiceFactory;
import org.ruoyi.chat.service.chat.IChatCostService;
import org.ruoyi.chat.service.chat.IChatService;
import org.ruoyi.chat.service.chat.ISseService;
import org.ruoyi.chat.util.IpUtil;
import org.ruoyi.chat.util.SSEUtil;
@@ -61,9 +63,7 @@

    private final IChatModelService chatModelService;

    private final OpenAIServiceImpl openAIService;

    private final OllamaServiceImpl ollamaService;
    private final ChatServiceFactory chatServiceFactory;

    private final IChatSessionService chatSessionService;

@@ -95,7 +95,8 @@
                chatCostService.deductToken(chatRequest);
            }
            // 根据模型分类调用不同的处理逻辑
            switchModelAndHandle(chatRequest,sseEmitter);
            IChatService chatService = chatServiceFactory.getChatService(chatModelVo.getCategory());
            chatService.chat(chatRequest, sseEmitter);
        } catch (Exception e) {
            log.error(e.getMessage(),e);
            SSEUtil.sendErrorEvent(sseEmitter,e.getMessage());
@@ -147,17 +148,6 @@
            }
    }

    /**
     *  根据模型名称前缀调用不同的处理逻辑
     */
    private void switchModelAndHandle(ChatRequest chatRequest,SseEmitter emitter) {
        // 调用ollama中部署的本地模型
        if (ChatModeType.OLLAMA.getCode().equals(chatModelVo.getCategory())) {
            ollamaService.chat(chatRequest,emitter);
        } else {
            openAIService.chat(chatRequest,emitter);
        }
    }

    /**
     *  构建消息列表