diff --git a/src/main/java/com/yutou/qqbot/QQBotApplication.java b/src/main/java/com/yutou/qqbot/QQBotApplication.java index bd93977..f3404ce 100644 --- a/src/main/java/com/yutou/qqbot/QQBotApplication.java +++ b/src/main/java/com/yutou/qqbot/QQBotApplication.java @@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class QQBotApplication { - public static final String version = "QQBot v.1.7.12"; + public static final String version = "QQBot v.1.7.13"; public static void main(String[] args) { System.out.println("version = " + version); diff --git a/src/main/java/com/yutou/qqbot/gpt/BaiduGPTManager.java b/src/main/java/com/yutou/qqbot/gpt/BaiduGPTManager.java index 56c23a8..0840200 100644 --- a/src/main/java/com/yutou/qqbot/gpt/BaiduGPTManager.java +++ b/src/main/java/com/yutou/qqbot/gpt/BaiduGPTManager.java @@ -63,16 +63,6 @@ public class BaiduGPTManager extends AbsGPTManager { return count; } - public synchronized void setModelFor40() { - model = modelFor40; - ConfigTools.save(ConfigTools.CONFIG, ConfigTools.BAIDU_GPT_VERSION, "4.0"); - } - - public synchronized void setModelFor35() { - model = modelFor35; - ConfigTools.save(ConfigTools.CONFIG, ConfigTools.BAIDU_GPT_VERSION, "3.5"); - } - // 这个是官方的示例代码,表示连续对话 @@ -188,6 +178,12 @@ public class BaiduGPTManager extends AbsGPTManager { return null; } + @Override + public AbsGPTManager setModel(String model) { + ConfigTools.save(ConfigTools.CONFIG, ConfigTools.BAIDU_GPT_VERSION, model); + return super.setModel(model); + } + @Override public String getGPTVersion() { return model; diff --git a/src/main/java/com/yutou/qqbot/gpt/SiliconGPTManager.java b/src/main/java/com/yutou/qqbot/gpt/SiliconGPTManager.java index 08ab7e4..32fac33 100644 --- a/src/main/java/com/yutou/qqbot/gpt/SiliconGPTManager.java +++ b/src/main/java/com/yutou/qqbot/gpt/SiliconGPTManager.java @@ -89,6 +89,12 @@ public class SiliconGPTManager extends AbsGPTManager { } + @Override + public AbsGPTManager setModel(String model) { + ConfigTools.save(ConfigTools.CONFIG, ConfigTools.GPT_SILICON, model); + return super.setModel(model); + } + @Override public File textToImage(String user, String text) { return null; diff --git a/src/main/java/com/yutou/qqbot/models/Commands/BaiduGPT.java b/src/main/java/com/yutou/qqbot/models/Commands/BaiduGPT.java index a1f0285..757df20 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/BaiduGPT.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/BaiduGPT.java @@ -96,8 +96,10 @@ public class BaiduGPT extends Model { val text = event.getTextMessage().replace("@" + QQDatabase.getMe().getUserId(), "").replace("大模型切换到", "").trim(); if(text.contains("baidu")|| text.contains("百度")){ gptManager= BaiduGPTManager.class; + ConfigTools.save(ConfigTools.CONFIG, ConfigTools.GPT, "baidu"); }else if(text.contains("silicon")||text.contains("硅基")){ gptManager= SiliconGPTManager.class; + ConfigTools.save(ConfigTools.CONFIG, ConfigTools.GPT, "silicon"); } list.add(new At(user)); list.add(new Text("切换为" + gptManager.getSimpleName())); @@ -154,7 +156,6 @@ public class BaiduGPT extends Model { messageEvent.setRawMessage(""); new BaiduGPT().onMessage(123456789L, messageEvent, false); BaiduGPTManager.getManager().clear(); - BaiduGPTManager.getManager().setModelFor40(); new BaiduGPT().onMessage(123456789L, messageEvent, false); /* BaiduGPTManager.getManager().clear(); BaiduGPTManager.getManager().setModelFor35();