From 629da7314cfdb172ba734d4abafa51d7f0c32c3a Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Wed, 03 Sep 2025 10:45:49 +0800 Subject: [PATCH] feat(ai): 更新阿里云大模型版本并调整生成参数 --- src/main/java/cc/mrbird/febs/ai/controller/TestController.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/ai/controller/TestController.java b/src/main/java/cc/mrbird/febs/ai/controller/TestController.java index 7bc45f1..b8311c0 100644 --- a/src/main/java/cc/mrbird/febs/ai/controller/TestController.java +++ b/src/main/java/cc/mrbird/febs/ai/controller/TestController.java @@ -4,7 +4,8 @@ import cc.mrbird.febs.ai.mapper.AiMemberMapper; import cc.mrbird.febs.ai.req.talk.AiTalkAnswerStream; import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkStreamVo; -import cc.mrbird.febs.ai.strategy.LlmStrategyEnum; +import cc.mrbird.febs.ai.service.AiService; +import cc.mrbird.febs.ai.strategy.enumerates.LlmStrategyEnum; import cc.mrbird.febs.ai.strategy.LlmStrategyFactory; import cc.mrbird.febs.ai.strategy.param.LlmStrategyDto; import cc.mrbird.febs.ai.utils.UUID; @@ -18,8 +19,6 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; -import cn.hutool.json.JSONUtil; -import com.alibaba.dashscope.aigc.multimodalconversation.MultiModalConversationResult; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.reactivex.Flowable; @@ -57,6 +56,7 @@ private final MallMemberMapper mallMemberMapper; private final AiMemberMapper aiMemberMapper; + private final AiService aiService; private final RedisUtils redisUtils; private final LlmStrategyFactory llmStrategyFactory; @ApiOperation(value = "登录测试", notes = "登录测试") @@ -166,9 +166,9 @@ llmStrategyDto.setContent(dto.getQuestion()); llmStrategyDtoList.add(llmStrategyDto); } - String modelName = LlmStrategyEnum.getName(dto.getType()); + String modelName = LlmStrategyEnum.getName(aiService.getSystemSetAiType()); - return llmStrategyFactory.getCalculationStrategyMap().get(modelName).llmInvokeStreaming(llmStrategyDtoList); + return llmStrategyFactory.getCalculationStrategyMap().get(modelName).llmInvokeStreamingWithThink(llmStrategyDtoList); } @@ -195,7 +195,7 @@ llmStrategyDto.setContent(dto.getQuestion()); llmStrategyDtoList.add(llmStrategyDto); } - String modelName = LlmStrategyEnum.getName(dto.getType()); + String modelName = LlmStrategyEnum.getName(aiService.getSystemSetAiType()); return llmStrategyFactory.getCalculationStrategyMap().get(modelName).llmInvokeNonStreaming(llmStrategyDtoList); } @@ -215,7 +215,7 @@ // 若没有配置环境变量,请用阿里云百炼API Key将下行替换为:.apiKey("sk-xxx") .apiKey("sk-babdcf8799144134915cee2683794b2f") // 模型列表:https://help.aliyun.com/zh/model-studio/getting-started/models - .model("qwen-plus") + .model("qwen3-14b-ft-202509031002-7446") // .model("deepseek-r1") // .model("qwen-turbo-0624-ft-202508281725-c2dc") .messages(Arrays.asList(systemMsg, userMsg)) @@ -241,9 +241,10 @@ // 若没有配置环境变量,请用阿里云百炼API Key将下行替换为:.apiKey("sk-xxx") .apiKey("sk-babdcf8799144134915cee2683794b2f") // 模型列表:https://help.aliyun.com/zh/model-studio/getting-started/models - .model("qwen-plus") + .model("qwen3-14b-ft-202509031002-7446") .messages(Arrays.asList(systemMsg, userMsg)) .resultFormat(GenerationParam.ResultFormat.MESSAGE) + .enableThinking( false) .build(); return gen.call(param); } -- Gitblit v1.9.1