diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/AliYunQianWen.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/AliYunQianWen.java index a8171e8..b964fd3 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/AliYunQianWen.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/AliYunQianWen.java @@ -28,13 +28,7 @@ public class AliYunQianWen { /** * 阿里千问配置参数 */ - static final QwenParam qwenParam = QwenParam.builder().model(Generation.Models.QWEN_PLUS) - .resultFormat(QwenParam.ResultFormat.MESSAGE) - .topP(0.8) - .apiKey(SpringUtil.getProperty("Ali.qianwen")) - .enableSearch(true) - .incrementalOutput(true) // get streaming output incrementally - .build();; + QwenParam qwenParam; /** * 消息管理,上下文。默认最多10个 @@ -45,6 +39,16 @@ public class AliYunQianWen { GenerationResult lastGenerationResult = null; + public AliYunQianWen(String key) { + qwenParam = QwenParam.builder().model(Generation.Models.QWEN_PLUS) + .resultFormat(QwenParam.ResultFormat.MESSAGE) + .topP(0.8) + .apiKey(key) + .enableSearch(true) + .incrementalOutput(true) // get streaming output incrementally + .build(); + } + public void sendMessage(String msg, Consumer onNext, diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/QWenService.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/QWenService.java index 2727add..84dc0b6 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/QWenService.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/QWenService.java @@ -1,5 +1,6 @@ package com.qiuguo.iot.third.service; +import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.qiuguo.iot.base.constans.RedisConstans; @@ -39,7 +40,7 @@ public class QWenService { public Mono communication(TongYiCommunicationRest rest, Consumer onNext){ AliYunQianWen aliQianWen = null; if (!qianwenGroup.containsKey(rest.getOnlyId())) { - aliQianWen = new AliYunQianWen(); + aliQianWen = new AliYunQianWen(SpringUtil.getProperty("Ali.qianwen")); qianwenGroup.put(rest.getOnlyId(), aliQianWen); } else { aliQianWen = qianwenGroup.get(rest.getOnlyId());