feat: v2群聊发送图片支持非直链上传

Kloping · Kloping · commit 4e02646feac0 · 2024-03-24T16:23:26.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.kloping</groupId>
     <artifactId>bot-qqpd-java</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1-Beta1</version>
 
     <packaging>jar</packaging>
     <name>bot-qqpd-java</name>
diff --git a/src/main/java/io/github/kloping/qqbot/entities/ex/Image.java b/src/main/java/io/github/kloping/qqbot/entities/ex/Image.java
@@ -16,15 +16,14 @@
 import org.jsoup.helper.HttpConnection;
 
 import java.io.ByteArrayInputStream;
+import java.util.Base64;
 import java.util.UUID;
 
 import static io.github.kloping.qqbot.entities.qqpd.Channel.SEND_FORM_DATA_HEADERS;
 import static io.github.kloping.qqbot.entities.qqpd.Channel.SEND_MESSAGE_HEADERS;
 
 /**
  *
- * 发送到q群时必须使用url构造参数
- * <br>
  * 发送到频道时url必须备案(少数情况不需要
  * @author github.kloping
  */
@@ -87,14 +86,20 @@ public Result send(SenderAndCidMidGetter er) {
             return er.send(packet);
         } else {
             SenderV2 v2 = (SenderV2) er;
-            if (RawMessage.imagePrepare(this, er.getBot())) return null;
-            V2Result result = v2.getV2().sendFile(er.getCid(), String.format("{\"file_type\": %s,\"url\": \"%s\",\"srv_send_msg\": false}", getFile_type(), getUrl()), Channel.SEND_MESSAGE_HEADERS);
+            RawMessage.imagePrepare(this, er.getBot());
+            V2Result result = null;
+            if (Judge.isNotEmpty(getUrl())) {
+                result = v2.getV2().sendFile(er.getCid(), String.format("{\"file_type\": %s,\"url\": \"%s\",\"srv_send_msg\": false}", getFile_type(), getUrl()), Channel.SEND_MESSAGE_HEADERS);
+            } else {
+                result = v2.getV2().sendFile(er.getCid(), String.format("{\"file_type\": %s,\"file_data\": \"%s\",\"srv_send_msg\": false}", getFile_type(), Base64.getEncoder().encodeToString(bytes)), Channel.SEND_MESSAGE_HEADERS);
+            }
             result.logFileInfo(er.getBot().logger, this);
             V2MsgData data = new V2MsgData();
             data.setMsg_type(7);
             if (Judge.isNotEmpty(er.getMid())) data.setMsg_id(er.getMid());
             data.setMedia(new V2MsgData.Media(result.getFile_info()));
             data.setMsg_seq(v2.getMsgSeq());
+
             return new Result<V2Result>(v2.getV2().send(er.getCid(), data.toString(), SEND_MESSAGE_HEADERS));
         }
     }
diff --git a/src/main/java/io/github/kloping/qqbot/entities/ex/msg/MessageChain.java b/src/main/java/io/github/kloping/qqbot/entities/ex/msg/MessageChain.java
@@ -110,7 +110,7 @@ public Result send(SenderAndCidMidGetter er) {
             for (SendAble e0 : this.data) {
                 if (e0 instanceof Image) {
                     Image image = (Image) e0;
-                    if (RawMessage.imagePrepare(image, er.getBot())) continue;
+                    RawMessage.imagePrepare(image, er.getBot());
                     if (!flag0) {
                         if (image.getFile_type() != 1) {
                             image.send(er);
@@ -124,7 +124,13 @@ public Result send(SenderAndCidMidGetter er) {
                         data = new V2MsgData();
                         if (Judge.isNotEmpty(er.getMid())) data.setMsg_id(er.getMid());
                     }
-                    result = new Result<>(v2.getV2().sendFile(er.getCid(), String.format("{\"file_type\": %s,\"url\": \"%s\",\"srv_send_msg\": false}", image.getFile_type(), image.getUrl()), Channel.SEND_MESSAGE_HEADERS));
+                    if (Judge.isNotEmpty(image.getUrl())) {
+                        result = new Result<>(v2.getV2().sendFile(er.getCid(), String.format("{\"file_type\": %s,\"url\": \"%s\",\"srv_send_msg\": false}",
+                                image.getFile_type(), image.getUrl()), Channel.SEND_MESSAGE_HEADERS));
+                    } else {
+                        result = new Result<>(v2.getV2().sendFile(er.getCid(), String.format("{\"file_type\": %s,\"file_data\": \"%s\",\"srv_send_msg\": false}",
+                                image.getFile_type(), Base64.getEncoder().encodeToString(image.getBytes())), Channel.SEND_MESSAGE_HEADERS));
+                    }
                     result.getData().logFileInfo(er.getBot().logger, image);
                     data.setMsg_type(7);
                     data.setMedia(new V2MsgData.Media(result.getData().getFile_info()));
diff --git a/src/main/java/io/github/kloping/qqbot/entities/qqpd/message/RawMessage.java b/src/main/java/io/github/kloping/qqbot/entities/qqpd/message/RawMessage.java
@@ -1,6 +1,7 @@
 package io.github.kloping.qqbot.entities.qqpd.message;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import io.github.kloping.MySpringTool.PartUtils;
 import io.github.kloping.judge.Judge;
 import io.github.kloping.qqbot.api.*;
 import io.github.kloping.qqbot.api.message.Pinsble;
@@ -74,21 +75,19 @@ public Result send(String text) {
         return send(text, this);
     }
 
-    public static boolean imagePrepare(Image msg, Bot bot) {
+    public static void imagePrepare(Image msg, Bot bot) {
         try {
             if (Judge.isEmpty(msg.getUrl())) {
                 if (msg.getBytes() != null) if (bot.getConfig().getInterceptor0() != null) {
                     String url = bot.getConfig().getInterceptor0().upload(msg.getBytes());
                     if (Judge.isNotEmpty(url)) {
                         msg.setUrl(url);
-                    } else return true;
+                    }
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            bot.logger.error(e.getMessage());
+            bot.logger.error(PartUtils.getExceptionLine(e));
         }
-        return false;
     }
 
     @Override
diff --git a/src/main/java/io/github/kloping/qqbot/entities/qqpd/v2/Group.java b/src/main/java/io/github/kloping/qqbot/entities/qqpd/v2/Group.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import io.github.kloping.judge.Judge;
 import io.github.kloping.qqbot.api.SendAble;
 import io.github.kloping.qqbot.api.SenderV2;
 import io.github.kloping.qqbot.entities.ex.Image;
@@ -15,6 +16,8 @@
 import lombok.Getter;
 import lombok.experimental.Accessors;
 
+import java.util.Base64;
+
 import static io.github.kloping.qqbot.entities.qqpd.Channel.SEND_MESSAGE_HEADERS;
 
 /**
@@ -42,8 +45,13 @@ public Result<V2Result> send(String text, RawMessage message) {
     }
 
     private V2Result sendImage(Image msg) {
-        if (RawMessage.imagePrepare(msg, bot)) return null;
-        V2Result result = bot.groupBaseV2.sendFile(getOpenid(), String.format("{\"file_type\": %s,\"url\": \"%s\",\"srv_send_msg\": false}", msg.getFile_type(), msg.getUrl()), Channel.SEND_MESSAGE_HEADERS);
+        RawMessage.imagePrepare(msg, bot);
+        V2Result result = null;
+        if (Judge.isNotEmpty(msg.getUrl())) {
+            result = bot.groupBaseV2.sendFile(getOpenid(), String.format("{\"file_type\": %s,\"url\": \"%s\",\"srv_send_msg\": false}", msg.getFile_type(), msg.getUrl()), Channel.SEND_MESSAGE_HEADERS);
+        } else {
+            result = bot.groupBaseV2.sendFile(getCid(), String.format("{\"file_type\": %s,\"file_data\": \"%s\",\"srv_send_msg\": false}", msg.getFile_type(), Base64.getEncoder().encodeToString(msg.getBytes())), Channel.SEND_MESSAGE_HEADERS);
+        }
         result.logFileInfo(bot.logger, msg);
         V2MsgData data = new V2MsgData();
         data.setMedia(new V2MsgData.Media(result.getFile_info()));
diff --git a/src/main/java/io/github/kloping/qqbot/http/GroupBaseV2.java b/src/main/java/io/github/kloping/qqbot/http/GroupBaseV2.java
@@ -28,6 +28,7 @@ public interface GroupBaseV2 extends BaseV2{
 
     /**
      * 发送群聊媒体
+     * <table><thead><tr><th><strong>属性</strong></th> <th><strong>类型</strong></th> <th><strong>必填</strong></th> <th><strong>说明</strong></th></tr></thead> <tbody><tr><td>file_type</td> <td>int</td> <td>是</td> <td>媒体类型：1 图片，2 视频，3 语音，4 文件（暂不开放）<br>资源格式要求<br>图片：png/jpg，视频：mp4，语音：silk</td></tr> <tr><td>url</td> <td>string</td> <td>是</td> <td>需要发送媒体资源的url</td></tr> <tr><td>srv_send_msg</td> <td>bool</td> <td>是</td> <td>设置 true 会直接发送消息到目标端，且会占用<code>主动消息频次</code></td></tr> <tr><td>file_data</td> <td></td> <td>否</td> <td>【暂未支持】</td></tr></tbody></table>
      * @param gid
      * @param body
      * @param headers
diff --git a/src/main/java/io/github/kloping/qqbot/impl/BaseConnectedEvent.java b/src/main/java/io/github/kloping/qqbot/impl/BaseConnectedEvent.java
@@ -41,6 +41,6 @@ public String getClassName() {
 
     @Override
     public String toString() {
-        return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.0.", bot.getConfig().getAppid());
+        return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-Beta1", bot.getConfig().getAppid());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package io.github.kloping.qqbot.entities.qqpd.message;`
`2`	`2`
`3`	`3`	`import com.alibaba.fastjson.annotation.JSONField;`
	`4`	`+import io.github.kloping.MySpringTool.PartUtils;`
`4`	`5`	`import io.github.kloping.judge.Judge;`
`5`	`6`	`import io.github.kloping.qqbot.api.*;`
`6`	`7`	`import io.github.kloping.qqbot.api.message.Pinsble;`
`@@ -74,21 +75,19 @@ public Result send(String text) {`
`74`	`75`	`return send(text, this);`
`75`	`76`	`}`
`76`	`77`
`77`		`- public static boolean imagePrepare(Image msg, Bot bot) {`
	`78`	`+ public static void imagePrepare(Image msg, Bot bot) {`
`78`	`79`	`try {`
`79`	`80`	`if (Judge.isEmpty(msg.getUrl())) {`
`80`	`81`	`if (msg.getBytes() != null) if (bot.getConfig().getInterceptor0() != null) {`
`81`	`82`	`String url = bot.getConfig().getInterceptor0().upload(msg.getBytes());`
`82`	`83`	`if (Judge.isNotEmpty(url)) {`
`83`	`84`	`msg.setUrl(url);`
`84`		`- } else return true;`
	`85`	`+ }`
`85`	`86`	`}`
`86`	`87`	`}`
`87`	`88`	`} catch (Exception e) {`
`88`		`- e.printStackTrace();`
`89`		`- bot.logger.error(e.getMessage());`
	`89`	`+ bot.logger.error(PartUtils.getExceptionLine(e));`
`90`	`90`	`}`
`91`		`- return false;`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public String getClassName() {`
`41`	`41`
`42`	`42`	`@Override`
`43`	`43`	`public String toString() {`
`44`		`- return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.0.", bot.getConfig().getAppid());`
	`44`	`+ return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-Beta1", bot.getConfig().getAppid());`
`45`	`45`	`}`
`46`	`46`	`}`