1.5.1-R3

feat: refactor code for better performance and fix bugs
fix #30 fix #31

Author: Kloping

README.md

@@ -18,7 +18,7 @@ Maven
 <dependency>
     <groupId>io.github.kloping</groupId>
     <artifactId>bot-qqpd-java</artifactId>
-    <version>1.5.1-L3</version>
+    <version>1.5.1-R3</version>
 </dependency>
 ```
 
@@ -45,12 +45,7 @@ Maven
 ```java
 starter.registerListenerHost(new ListenerHost(){
     @EventReceiver
-    public void onEvent(MessageChannelReceiveEvent event){
-        event.send("测试");
-    }
-
-    @EventReceiver 
-    public void onEvent(MessageDirectReceiveEvent event){
+    public void onEvent(MessageEvent event){
         event.send("测试通过");
     }
 });
@@ -85,5 +80,3 @@ import io.github.kloping.qqbot.impl.ListenerHost;
 ```
 
 更多使用方式参考查看 [test](./src/test/java)
-
-SDK尚在完善中...

docs/event.md

@@ -11,21 +11,6 @@
 [详细实现](readme.md#事件注册)
 
 - [MessageEvent](../src/main/java/io/github/kloping/qqbot/api/message/MessageEvent.java) 消息事件顶级接口
-  - [MessageDeleteEvent](../src/main/java/io/github/kloping/qqbot/api/message/MessageDeleteEvent.java) 消息撤回事件
-  - [MessageContainsAtEvent](../src/main/java/io/github/kloping/qqbot/api/message/MessageContainsAtEvent.java)
-    子频道存在AT消息事件
-  - [MessageChannelReceiveEvent](../src/main/java/io/github/kloping/qqbot/api/message/MessageChannelReceiveEvent.java)
-    子频道消息接收事件
-  - [MessageDirectReceiveEvent](../src/main/java/io/github/kloping/qqbot/api/message/MessageDirectReceiveEvent.java)
-    私信消息接收事件
-  - [MessageReactionEvent](../src/main/java/io/github/kloping/qqbot/api/message/MessageReactionEvent.java) 消息被 添加/移除
-    表情 事件
-- [GuildEvent](../src/main/java/io/github/kloping/qqbot/api/event/GuildEvent.java) 频道事件
-  - [GuildUpdateEvent](../src/main/java/io/github/kloping/qqbot/api/event/GuildUpdateEvent.java) 频道信息 更新事件
-  - [ChannelEvent](../src/main/java/io/github/kloping/qqbot/api/event/ChannelEvent.java) 子频道事件
-  - [MemberUpdateEvent](../src/main/java/io/github/kloping/qqbot/api/event/MemberUpdateEvent.java) 成员信息 更新事件
-    - BaseMemberRemoveEvent
-    - BaseMemberUpdateEvent
 
 > 对框架未处理的事件 在 1.5.0-Alpha5 中添加的[事件注册的方法](../src/test/java/EventsRegisterTest.java)
 

docs/message.md

@@ -24,6 +24,8 @@
   - MessageChain
   - MessagePre
   - PlainText
+  - Markdown
+  - Keyboard
 - 消息发送者 Sender
   - BaseMessageChannelReceiveEvent
   - BaseMessageContainsAtEvent

docs/readme.md

@@ -1,5 +1,5 @@
-## QQ频道机器人 Java SDK 非官方 文档
-_**待完善..**_
+## QQ官方机器人 JavaSDK 开发文档
+
 <hr>
 
 ### 包目录说明:
@@ -16,12 +16,12 @@ _**待完善..**_
 
 <hr>
 
-### 相关指引
+#### 相关部分文档指引
 
 - **[事件 event](event.md)**
 - **[消息 message](message.md)**
-- **[动作 action](action.md)**
 - **[网络相关设置](network.md)**
+- **[V2群](v2.md)**
 
 <hr>
 
@@ -32,7 +32,7 @@ _**待完善..**_
 #### 启动方式
 
 ```java
-// 启动类新建
+// 启动类新建 一般启动方法 不可接收发送 群聊消息 见v2文档
 Starter starter = new Starter("appid", "token");
 // 私域推荐Intents.PRIVATE_INTENTS 公域机器人推荐 Intents.PUBLIC_INTENTS
 starter.getConfig().setCode(Intents.PRIVATE_INTENTS.getCode());
@@ -45,13 +45,9 @@ starter.run();
 
 ```java
 starter.registerListenerHost(new ListenerHost(){
-    @Override
-    public void handleException(Throwable e){
-    }
-    
     //必须要有该注解 否则将不注册
     @EventReceiver
-    public void onEvent(MessageChannelReceiveEvent event){
+    public void onEvent(MessageEvent event){
         event.send("Hello World!");
     }
 });
@@ -74,12 +70,6 @@ public class LogDemo {
 ```
 <hr>
 
-### 依赖排斥
-
-- v1.5.0-Beta7 在与com.alibaba.fastjson2:fastjson2
-  同时引用时会产生大量空指针[#20](https://github.com/Kloping/qqpd-bot-java/issues/20)
-
-<hr>
 
 ### 自定义消息发送 
 > 通过http请求达到想要的目的获取bot请求必要的请求头方式
@@ -99,8 +89,14 @@ starter.APPLICATION.INSTANCE.getContextManager().getContextEntity(Start0.class).
         @EventReceiver
         public void onEvent(ConnectedEvent event) {
             V2MsgData data = new V2MsgData().setContent("测试主动消息");
-            starter.getBot().groupBaseV2.send("8468B15808B8200A56E6DD92EBA51AAC", data.toString(), SEND_MESSAGE_HEADERS);
+            starter.getBot().groupBaseV2.send("groupOpenId", data.toString(), SEND_MESSAGE_HEADERS);
         }
     });
 ![img.png](./imgs/img.png)
 
+### 依赖排斥
+
+- v1.5.0-Beta7 在与com.alibaba.fastjson2:fastjson2
+  同时引用时会产生大量空指针[#20](https://github.com/Kloping/qqpd-bot-java/issues/20)
+
+<hr>

docs/v2.md

@@ -6,10 +6,6 @@ v2 使用条件(必须) 当前(23.11.16)
 - 必须有 **_[在QQ群配置](https://q.qq.com/qqbot/#/developer/sandbox)_**  的权限
 - 配置完成后，群主可从沙箱群“设置-群机器人”打开机器人列表页添加测试机器人
 
-其他事项
-
-- 当前版本(1.5.0-R3) 仅支持了群聊at消息的监听与被动发送(文本,图片)
-
 <hr>
 
 > 以下为 必要启动代码

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.kloping</groupId>
     <artifactId>bot-qqpd-java</artifactId>
-    <version>1.5.1-L3</version>
+    <version>1.5.1-R3</version>
 
     <packaging>jar</packaging>
     <name>bot-qqpd-java</name>

src/main/java/io/github/kloping/qqbot/entities/ex/Markdown.java

@@ -1,9 +1,9 @@
 package io.github.kloping.qqbot.entities.ex;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.annotation.JSONField;
 import io.github.kloping.qqbot.api.SendAble;
 import io.github.kloping.qqbot.api.SenderAndCidMidGetter;
+import io.github.kloping.qqbot.api.SenderV2;
 import io.github.kloping.qqbot.entities.ex.enums.EnvType;
 import io.github.kloping.qqbot.entities.qqpd.message.RawPreMessage;
 import io.github.kloping.qqbot.http.data.Result;
@@ -77,17 +77,13 @@ public Result<V2Result> send(SenderAndCidMidGetter er) {
     }
 
     public Result<V2Result> send(SenderAndCidMidGetter er, Integer msgSeq) {
-        if (er.getEnvType() == EnvType.GROUP) {
-            V2MsgData v2MsgData = new V2MsgData();
-            v2MsgData.setMarkdown(this);
-            v2MsgData.setMsg_type(2);
-            v2MsgData.setMsg_id(er.getMid());
+        if (er.getEnvType().isV2()) {
+            V2MsgData v2MsgData = new V2MsgData().setMarkdown(this).setMsg_type(2).setMsg_id(er.getMid());
             if (keyboard != null) v2MsgData.setKeyboard(getKeyboard());
-            return new Result(er.getBot().groupBaseV2.send(er.getCid(), JSON.toJSONString(v2MsgData), SEND_MESSAGE_HEADERS));
+            SenderV2 senderV2 = (SenderV2) er;
+            return new Result(senderV2.getV2().send(er.getCid(), JSON.toJSONString(v2MsgData), SEND_MESSAGE_HEADERS));
         } else if (er.getEnvType() == EnvType.GUILD) {
-            RawPreMessage preMessage = new RawPreMessage();
-            preMessage.setMarkdown(this);
-            preMessage.setMsgId(er.getMid());
+            RawPreMessage preMessage = new RawPreMessage().setMarkdown(this).setMsgId(er.getMid());
             return new Result(er.getBot().messageBase.send(er.getCid(), preMessage, SEND_MESSAGE_HEADERS));
         }
         return er.send(this);

src/main/java/io/github/kloping/qqbot/entities/ex/enums/EnvType.java

@@ -6,5 +6,9 @@
  * @author github.kloping
  */
 public enum EnvType {
-    GUILD, GROUP, GROUP_USER, USER
+    GUILD, GROUP, GROUP_USER, USER;
+
+    public boolean isV2() {
+        return this == GROUP_USER || this == USER || this == GROUP;
+    }
 }

src/main/java/io/github/kloping/qqbot/impl/BaseConnectedEvent.java

@@ -41,7 +41,7 @@ public String getClassName() {
 
     @Override
     public String toString() {
-        return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-L3", bot.getConfig().getAppid());
+        return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-R3", bot.getConfig().getAppid());
     }
 
     @Override

src/main/java/io/github/kloping/qqbot/utils/BaseUtils.java

@@ -38,9 +38,6 @@ public static void packet2pre(MessagePacket packet, RawPreMessage msg) {
         if (Judge.isNotEmpty(packet.getImage())) {
             msg.setImage(packet.getImage());
         }
-        if (Judge.isNotEmpty(packet.getImage())) {
-            msg.setImage(packet.getImage());
-        }
         if (Judge.isNotEmpty(packet.getReplyId())) {
             msg.setMessageReference(new MessageReference(packet.getReplyId()));
         }