Merge pull request #83 from ashinnotfound/feat/dall-3

Feat/dall-3 & TTS

Author: ashinnotfound

README.md

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.ashin</groupId>
     <artifactId>ChatGPT-YourChatRobot</artifactId>
-    <version>3.8</version>
+    <version>3.9</version>
     <name>myGPT</name>
     <description>快来把你的qq或微信变为chatgpt</description>
     <properties>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>com.theokanning.openai-gpt3-java</groupId>
             <artifactId>service</artifactId>
-            <version>0.16.1</version>
+            <version>0.18.2</version>
         </dependency>
         <dependency>
             <groupId>com.knuddels</groupId>

pom.xml

@@ -1,7 +1,13 @@
 package com.ashin.client;
 
+import cn.zhouyafeng.itchat4j.Wechat;
+import com.ashin.config.KeywordConfig;
 import com.ashin.config.QqConfig;
+import com.ashin.config.WechatConfig;
 import com.ashin.handler.QqMessageHandler;
+import com.ashin.handler.WechatMessageHandler;
+import com.ashin.service.InteractService;
+import com.ashin.util.BotUtil;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.mamoe.mirai.BotFactory;
@@ -14,19 +20,30 @@
 
 @Component
 @Slf4j
-public class QqBotClient {
-
-    @Resource
-    private QqMessageHandler qqMessageHandler;
+public class BotClient {
     @Resource
     private QqConfig qqConfig;
-
-    // qq机器人实例
     @Getter
     private net.mamoe.mirai.Bot qqBot;
+    @Resource
+    private WechatConfig wechatConfig;
+    @Getter
+    private Wechat wechatBot;
+    @Resource
+    private InteractService interactService;
+    @Resource
+    private KeywordConfig keywordConfig;
+    @Resource
+    private BotUtil botUtil;
 
     @PostConstruct
     public void init() {
+        //微信
+        if (wechatConfig.getEnable()){
+            log.info("正在登录微信,请按提示操作：");
+            wechatBot = new Wechat(new WechatMessageHandler(interactService, keywordConfig, botUtil), wechatConfig.getQrPath());
+            wechatBot.start();
+        }
         if (qqConfig.getEnable()) {
             //登陆协议有ANDROID_PHONE, ANDROID_PAD, ANDROID_WATCH, IPAD, MACOS
             //若登陆失败可尝试更换协议
@@ -39,7 +56,7 @@ public void init() {
                 qqBot.login();
                 log.info("成功登录账号为 {} 的qq, 登陆协议为 {}", qqConfig.getAccount(), miraiProtocol);
                 //订阅监听事件
-                qqBot.getEventChannel().registerListenerHost(qqMessageHandler);
+                qqBot.getEventChannel().registerListenerHost(new QqMessageHandler(interactService, qqConfig, keywordConfig, botUtil));
             } catch (Exception e) {
                 log.error("登陆失败, qq账号为 {}, 登陆协议为 {}, 可尝试更换登陆协议, 具体原因: {}", qqConfig.getAccount(), miraiProtocol, e.getMessage());
             }

src/main/java/com/ashin/client/QqBotClient.java renamed to src/main/java/com/ashin/client/BotClient.java

@@ -22,4 +22,9 @@ public class GptConfig {
     private List<String> basicPrompt;
     private List<String> apiKey;
     private Long ofSeconds;
+    private String imageQuality;
+    private String imageStyle;
+    private String audioModel;
+    private String audioVoice;
+    private Double audioSpeed;
 }

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

@@ -15,5 +15,6 @@
 @ConfigurationProperties("keyword")
 public class KeywordConfig {
     private String reset;
-    private String draw;
+    private String image;
+    private String audio;
 }

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

@@ -18,5 +18,4 @@ public class QqConfig {
     private Long account;
     private Boolean acceptNewFriend;
     private Boolean acceptNewGroup;
-    private Boolean returnDrawByURL;
 }

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

@@ -0,0 +1,7 @@
+package com.ashin.constant;
+
+public enum ChatType {
+    TEXT,
+    IMAGE,
+    AUDIO,
+}

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

@@ -1,5 +1,6 @@
 package com.ashin.entity.bo;
 
+import com.ashin.constant.ChatType;
 import lombok.Data;
 
 /**
@@ -21,5 +22,5 @@ public class ChatBO {
     /**
      * 是否ai画图功能
      */
-    private boolean isAiDraw;
+    private ChatType chatType;
 }

src/main/java/com/ashin/constant/ChatType.java

@@ -0,0 +1,12 @@
+package com.ashin.entity.dto;
+
+import lombok.Data;
+
+import java.io.InputStream;
+
+@Data
+public class ChatResultDTO {
+    String StringResult;
+    InputStream inputStreamResult;
+    byte[] bytesResult;
+}