improvement:优化代码结构

Author: ashinnotfound

src/main/java/com/ashin/client/GptClient.java

@@ -0,0 +1,47 @@
+package com.ashin.client;
+
+import com.ashin.config.GptConfig;
+import com.ashin.config.ProxyConfig;
+import com.theokanning.openai.service.OpenAiService;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+@Slf4j
+public class GptClient {
+    @Resource
+    private ProxyConfig proxyConfig;
+    @Resource
+    private GptConfig gptConfig;
+
+    // openai服务list
+    @Getter
+    private List<OpenAiService> openAiServiceList;
+
+    @PostConstruct
+    public void init() {
+        //配置代理
+        if (!proxyConfig.getHost().isEmpty() && !proxyConfig.getPort().isEmpty()) {
+            System.setProperty("http.proxyHost", proxyConfig.getHost());
+            System.setProperty("https.proxyHost", proxyConfig.getHost());
+            System.setProperty("http.proxyPort", proxyConfig.getPort());
+            System.setProperty("https.proxyPort", proxyConfig.getPort());
+            log.info("代理设置成功!!! {}:{}", proxyConfig.getHost(), proxyConfig.getPort());
+        }
+        openAiServiceList = new ArrayList<>();
+        for (String apiKey : gptConfig.getApiKey()) {
+            apiKey = apiKey.trim();
+            if (!apiKey.isEmpty()) {
+                openAiServiceList.add(new OpenAiService(apiKey, Duration.ofSeconds(1000)));
+                log.info("apiKey为 {} 的账号初始化成功", apiKey);
+            }
+        }
+    }
+}

src/main/java/com/ashin/client/QqBotClient.java

@@ -0,0 +1,56 @@
+package com.ashin.client;
+
+import com.ashin.config.QqConfig;
+import com.ashin.handler.QqMessageHandler;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import net.mamoe.mirai.BotFactory;
+import net.mamoe.mirai.auth.BotAuthorization;
+import net.mamoe.mirai.utils.BotConfiguration;
+import org.springframework.stereotype.Component;
+import xyz.cssxsh.mirai.tool.FixProtocolVersion;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+
+@Component
+@Slf4j
+public class QqBotClient {
+
+    @Resource
+    private QqMessageHandler qqMessageHandler;
+    @Resource
+    private QqConfig qqConfig;
+
+    // qq机器人实例
+    @Getter
+    private net.mamoe.mirai.Bot qqBot;
+
+    @PostConstruct
+    public void init() {
+        if (qqConfig.getEnable()) {
+            //登录 登陆协议有ANDROID_PHONE, ANDROID_PAD, ANDROID_WATCH, IPAD, MACOS
+            try {
+                log.info("正在登录qq,请按提示操作：");
+                if (qqConfig.getMethod() == 1) {
+                    //密码登录
+                    qqBot = BotFactory.INSTANCE.newBot(qqConfig.getAccount(), qqConfig.getPassword().trim(), new BotConfiguration() {{
+                        setProtocol(BotConfiguration.MiraiProtocol.ANDROID_PAD);
+                    }});
+                    //使用临时修复插件
+                    FixProtocolVersion.update();
+                } else {
+                    //扫码登陆
+                    qqBot = BotFactory.INSTANCE.newBot(qqConfig.getAccount(), BotAuthorization.byQRCode(), configuration -> configuration.setProtocol(BotConfiguration.MiraiProtocol.ANDROID_WATCH));
+                }
+
+                qqBot.login();
+                log.info("成功登录账号为 {} 的qq, 登陆方式为 {}", qqConfig.getAccount(), qqConfig.getMethod() == 1 ? "密码登录" : "扫码登陆");
+                //订阅监听事件
+                qqBot.getEventChannel().registerListenerHost(qqMessageHandler);
+            } catch (Exception e) {
+                log.error("登陆失败，qq账号为 {}, 登陆方式为 {} ，原因：{}", qqConfig.getAccount(), qqConfig.getMethod() == 1 ? "密码登录" : "扫码登陆", e.getMessage());
+            }
+        }
+    }
+}

src/main/java/com/ashin/client/WechatBotClient.java

@@ -0,0 +1,32 @@
+package com.ashin.client;
+
+import cn.zhouyafeng.itchat4j.Wechat;
+import com.ashin.config.WechatConfig;
+import com.ashin.handler.WechatMessageHandler;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+
+@Component
+@Slf4j
+public class WechatBotClient {
+    @Resource
+    private WechatMessageHandler wechatMessageHandler;
+    @Resource
+    private WechatConfig wechatConfig;
+
+    @Getter
+    private Wechat wechatBot;
+    @PostConstruct
+    public void init() {
+        //微信
+        if (wechatConfig.getEnable()){
+            log.info("正在登录微信,请按提示操作：");
+            wechatBot = new Wechat(wechatMessageHandler, wechatConfig.getQrPath());
+            wechatBot.start();
+        }
+    }
+}

src/main/java/com/ashin/config/BotConfig.java

@@ -7,14 +7,18 @@
 import java.util.List;
 
 /**
- * chatgpt配置
+ * gpt配置
  *
  * @author ashinnotfound
  * @date 2023/03/04
  */
 @Data
 @Component
-@ConfigurationProperties("chatgpt")
-public class ChatgptConfig {
+@ConfigurationProperties("gpt")
+public class GptConfig {
+    private String model;
+    private Integer maxToken;
+    private Double temperature;
+    private List<String> basicPrompt;
     private List<String> apiKey;
 }

src/main/java/com/ashin/config/ChatgptConfig.java renamed to src/main/java/com/ashin/config/GptConfig.java

@@ -20,4 +20,5 @@ public class QqConfig {
     private String password;
     private Boolean acceptNewFriend;
     private Boolean acceptNewGroup;
+    private String resetWord;
 }

src/main/java/com/ashin/config/QqConfig.java

@@ -16,4 +16,5 @@
 public class WechatConfig {
     private Boolean enable;
     private String qrPath;
+    private String resetWord;
 }

src/main/java/com/ashin/config/WechatConfig.java

@@ -29,8 +29,8 @@ public class QqMessageHandler implements ListenerHost {
     private InteractService interactService;
     @Resource
     private QqConfig qqConfig;
-
-    private static final String RESET_WORD = "重置会话";
+    @Resource
+    private BotUtil botUtil;
 
     /**
      * 好友消息事件
@@ -62,9 +62,9 @@ public void onGroupMessageEvent(GroupMessageEvent event){
         }
     }
     private void response(@NotNull MessageEvent event, ChatBO chatBO, String prompt) {
-        if (RESET_WORD.equals(prompt)) {
+        if (qqConfig.getResetWord().equals(prompt)) {
             //检测到重置会话指令
-            BotUtil.resetPrompt(chatBO.getSessionId());
+            botUtil.resetPrompt(chatBO.getSessionId());
             event.getSubject().sendMessage("重置会话成功");
         } else {
             String response;