diff --git a/README.md b/README.md index f7ae515..8ad9b09 100644 --- a/README.md +++ b/README.md @@ -91,24 +91,25 @@ _✨ 基于 [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md #### 符合 OneBot 标准的 Event(部分 Event 比 OneBot 标准多上报几个字段,不影响使用) -| 事件类型 | Event | -|------|---------| -| 消息事件 | 私聊信息 | -| 消息事件 | 群消息 | -| 通知事件 | 群文件上传 | -| 通知事件 | 群管理员变动 | -| 通知事件 | 群成员减少 | -| 通知事件 | 群成员增加 | -| 通知事件 | 群禁言 | -| 通知事件 | 好友添加 | -| 通知事件 | 群消息撤回 | -| 通知事件 | 好友消息撤回 | -| 通知事件 | 群内戳一戳 | -| 通知事件 | 群成员荣誉变更 | -| 请求事件 | 加好友请求 | -| 请求事件 | 加群请求邀请 | - - +| 事件类型 | Event | +|------|-----------| +| 消息事件 | 私聊信息 | +| 消息事件 | 群消息 | +| 通知事件 | 群管理员变动 | +| 通知事件 | 群成员减少 | +| 通知事件 | 群成员增加 | +| 通知事件 | 群禁言 | +| 通知事件 | 好友添加 | +| 通知事件 | 群消息撤回 | +| 通知事件 | 好友消息撤回 | +| 通知事件 | 群内戳一戳 | +| 通知事件 | 好友戳一戳 | +| 通知事件 | 群成员荣誉变更 | +| 通知事件 | 群成员名片变更 | +| 通知事件 | 群成员特殊头衔变更 | +| 通知事件 | 其他客户端在线状态 | +| 请求事件 | 加好友请求 | +| 请求事件 | 加群请求邀请 | [//]: # (| 通知事件 | [群红包运气王] |) diff --git a/src/main/java/cn/evolvefield/mirai/onebot/core/MiraiApi.java b/src/main/java/cn/evolvefield/mirai/onebot/core/ApiMap.java similarity index 96% rename from src/main/java/cn/evolvefield/mirai/onebot/core/MiraiApi.java rename to src/main/java/cn/evolvefield/mirai/onebot/core/ApiMap.java index 7dc1528..f79b2c8 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/core/MiraiApi.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/core/ApiMap.java @@ -2,8 +2,9 @@ import cn.evolvefield.mirai.onebot.OneBotMirai; import cn.evolvefield.mirai.onebot.dto.response.ActionData; -import cn.evolvefield.mirai.onebot.dto.response.BooleanResp; -import cn.evolvefield.mirai.onebot.dto.response.MessageResponse; +import cn.evolvefield.mirai.onebot.dto.response.common.*; +import cn.evolvefield.mirai.onebot.dto.response.misc.BooleanResp; +import cn.evolvefield.mirai.onebot.dto.response.common.MessageResponse; import cn.evolvefield.mirai.onebot.dto.response.contact.FriendInfoResp; import cn.evolvefield.mirai.onebot.dto.response.contact.LoginInfoResp; import cn.evolvefield.mirai.onebot.dto.response.contact.StrangerInfoResp; @@ -11,13 +12,13 @@ import cn.evolvefield.mirai.onebot.dto.response.group.GroupHonorInfoResp; import cn.evolvefield.mirai.onebot.dto.response.group.GroupInfoResp; import cn.evolvefield.mirai.onebot.dto.response.group.GroupMemberInfoResp; -import cn.evolvefield.mirai.onebot.dto.response.misc.*; import cn.evolvefield.mirai.onebot.util.BaseUtils; import cn.evolvefield.mirai.onebot.util.DataBaseUtils; import cn.evolvefield.mirai.onebot.util.OnebotMsgParser; import cn.evolvefield.mirai.onebot.web.queue.CacheRequestQueue; import cn.evolvefield.mirai.onebot.web.queue.CacheSourceQueue; import com.alibaba.fastjson2.JSONObject; +import kotlinx.coroutines.flow.Flow; import lombok.Getter; import net.mamoe.mirai.Bot; import net.mamoe.mirai.LowLevelApi; @@ -26,6 +27,8 @@ import net.mamoe.mirai.contact.MemberPermission; import net.mamoe.mirai.contact.PermissionDeniedException; import net.mamoe.mirai.contact.announcement.OfflineAnnouncement; +import net.mamoe.mirai.contact.file.AbsoluteFileFolder; +import net.mamoe.mirai.contact.file.AbsoluteFolder; import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent; import net.mamoe.mirai.event.events.MemberJoinRequestEvent; import net.mamoe.mirai.event.events.NewFriendRequestEvent; @@ -43,7 +46,7 @@ * Date: 2022/10/4 1:41 * Version: 1.0 */ -public class MiraiApi { +public class ApiMap { Bot bot; @Getter private final LinkedHashMap cachedTempContact = new LinkedHashMap<>(); @@ -52,11 +55,11 @@ public class MiraiApi { @Getter private final CacheSourceQueue cachedSourceQueue = new CacheSourceQueue(); - public MiraiApi(Bot bot) { + public ApiMap(Bot bot) { this.bot = bot; } - public ActionData callMiraiApi(String action, JSONObject params, MiraiApi mirai) { + public ActionData callMiraiApi(String action, JSONObject params, ApiMap mirai) { ActionData responseDTO = new PluginFailure(); try { @@ -193,6 +196,9 @@ public ActionData callMiraiApi(String action, JSONObject params, MiraiApi mir case "set_essence_msg" -> { responseDTO = mirai.setEssenceMsg(params); } + case "get_group_root_files" -> { + responseDTO = mirai.setEssenceMsg(params); + } default -> OneBotMirai.logger.error(String.format("未知OneBot API: %s", action)); } } catch (IllegalArgumentException e) { @@ -207,9 +213,10 @@ public ActionData callMiraiApi(String action, JSONObject params, MiraiApi mir } return responseDTO; } + //////////////// + //// v11 //// + ////////////// - - //send public ActionData sendMessage(JSONObject params) { if (params.containsKey("message_type")) { switch (params.getString("message_type")) { @@ -659,10 +666,6 @@ public ActionData getVersionInfo(JSONObject params) { return data; } - //////////////// - //// v11 //// - ////////////// - public ActionData setGroupName(JSONObject params) { var groupId = params.getLong("group_id"); var name = params.getString("group_name"); @@ -700,38 +703,6 @@ public ActionData setGroupNotice(JSONObject params) { return new InvalidRequest(); } } - - public ActionData setEssenceMsg(JSONObject params) { - var groupId = params.getLong("group_id"); - var messageId = params.getInteger("message_id"); - bot.getGroupOrFail(groupId).setEssenceMessage(cachedSourceQueue.get(messageId)); - return new GeneralSuccess(); - - } - - public ActionData deleteEssenceMsg(JSONObject params) { - var groupId = params.getLong("group_id"); - var messageId = params.getInteger("message_id"); - bot.getGroupOrFail(groupId).setEssenceMessage(cachedSourceQueue.get(messageId)); - return new GeneralSuccess();//todo 等待mirai的api - - } - - ///////////////// - //// hidden //// - /////////////// - - - - @MiraiExperimentalApi - @LowLevelApi - public ActionData getWordSlice(JSONObject params) { - var content = params.getString("content"); - - return new GeneralSuccess(); - - } - //todo //////////////////////////////// //// currently unsupported //// @@ -762,4 +733,48 @@ public ActionData setRestartPlugin(JSONObject params) { } + ///////////////// + //// hidden //// + /////////////// + @MiraiExperimentalApi + @LowLevelApi + public ActionData getWordSlice(JSONObject params) { + var content = params.getString("content"); + + return new GeneralSuccess(); + + } + + ///////////////// + ////addition /// + /////////////// + public ActionData getGroupRootFiles(JSONObject params) { + var groupId = params.getLong("group_id"); + + //Mirai.getInstance().getFileCacheStrategy() + //bot.getGroupOrFail(groupId).setEssenceMessage(cachedSourceQueue.get(messageId)); + return new GeneralSuccess(); + + } + + public ActionData setEssenceMsg(JSONObject params) { + var groupId = params.getLong("group_id"); + var messageId = params.getInteger("message_id"); + bot.getGroupOrFail(groupId).setEssenceMessage(cachedSourceQueue.get(messageId)); + return new GeneralSuccess(); + + } + + public ActionData deleteEssenceMsg(JSONObject params) { + var groupId = params.getLong("group_id"); + var messageId = params.getInteger("message_id"); + //bot.getGroupOrFail(groupId).setEssenceMessage(cachedSourceQueue.get(messageId)); + return new GeneralSuccess();//todo 等待mirai的api + + } + + + + + } diff --git a/src/main/java/cn/evolvefield/mirai/onebot/core/BotSession.java b/src/main/java/cn/evolvefield/mirai/onebot/core/BotSession.java index 37134aa..b98cce7 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/core/BotSession.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/core/BotSession.java @@ -2,7 +2,6 @@ import cn.evolvefield.mirai.onebot.OneBotMirai; import cn.evolvefield.mirai.onebot.config.BotConfig; -import cn.evolvefield.mirai.onebot.dto.event.EventMap; import cn.evolvefield.mirai.onebot.dto.event.IgnoreEvent; import cn.evolvefield.mirai.onebot.web.websocket.OneBotWSServer; import com.alibaba.fastjson2.JSON; @@ -26,12 +25,12 @@ public class BotSession { private final OneBotWSServer websocketServer; @Getter - private final MiraiApi apiImpl; + private final ApiMap apiImpl; public BotSession(Bot bot, BotConfig botConfig){ this.bot = bot; this.botConfig = botConfig; - this.apiImpl = new MiraiApi(bot); + this.apiImpl = new ApiMap(bot); this.websocketServer = new OneBotWSServer(this); this.websocketServer.create(); } diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/event/EventMap.java b/src/main/java/cn/evolvefield/mirai/onebot/core/EventMap.java similarity index 99% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/event/EventMap.java rename to src/main/java/cn/evolvefield/mirai/onebot/core/EventMap.java index 1d627aa..71f3444 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/event/EventMap.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/core/EventMap.java @@ -1,7 +1,8 @@ -package cn.evolvefield.mirai.onebot.dto.event; +package cn.evolvefield.mirai.onebot.core; import cn.evolvefield.mirai.onebot.OneBotMirai; -import cn.evolvefield.mirai.onebot.dto.event.message.MessageMap; +import cn.evolvefield.mirai.onebot.dto.event.Event; +import cn.evolvefield.mirai.onebot.dto.event.IgnoreEvent; import cn.evolvefield.mirai.onebot.dto.event.notice.friend.FriendAddNoticeEvent; import cn.evolvefield.mirai.onebot.dto.event.notice.friend.PrivatePokeNoticeEvent; import cn.evolvefield.mirai.onebot.dto.event.notice.group.*; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/event/message/MessageMap.java b/src/main/java/cn/evolvefield/mirai/onebot/core/MessageMap.java similarity index 97% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/event/message/MessageMap.java rename to src/main/java/cn/evolvefield/mirai/onebot/core/MessageMap.java index b401171..8c91aac 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/event/message/MessageMap.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/core/MessageMap.java @@ -1,7 +1,8 @@ -package cn.evolvefield.mirai.onebot.dto.event.message; +package cn.evolvefield.mirai.onebot.core; import cn.evolvefield.mirai.onebot.dto.event.Event; import cn.evolvefield.mirai.onebot.dto.event.IgnoreEvent; +import cn.evolvefield.mirai.onebot.dto.event.message.PrivateMessageEvent; import cn.evolvefield.mirai.onebot.entity.Anonymous; import cn.evolvefield.mirai.onebot.util.DataBaseUtils; import cn.evolvefield.mirai.onebot.util.OnebotMsgParser; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/AsyncStarted.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/AsyncStarted.java similarity index 85% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/AsyncStarted.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/AsyncStarted.java index cc57a1c..2167fa9 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/AsyncStarted.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/AsyncStarted.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response.misc; +package cn.evolvefield.mirai.onebot.dto.response.common; import cn.evolvefield.mirai.onebot.dto.response.ActionData; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/GeneralSuccess.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/GeneralSuccess.java similarity index 85% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/GeneralSuccess.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/GeneralSuccess.java index d8d25a8..fbcdcd3 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/GeneralSuccess.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/GeneralSuccess.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response.misc; +package cn.evolvefield.mirai.onebot.dto.response.common; import cn.evolvefield.mirai.onebot.dto.response.ActionData; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/InvalidRequest.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/InvalidRequest.java similarity index 85% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/InvalidRequest.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/InvalidRequest.java index 973ac4b..58f682c 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/InvalidRequest.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/InvalidRequest.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response.misc; +package cn.evolvefield.mirai.onebot.dto.response.common; import cn.evolvefield.mirai.onebot.dto.response.ActionData; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/MessageResponse.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/MessageResponse.java similarity index 62% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/MessageResponse.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/MessageResponse.java index 996b80e..d9d7e67 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/MessageResponse.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/MessageResponse.java @@ -1,5 +1,6 @@ -package cn.evolvefield.mirai.onebot.dto.response; +package cn.evolvefield.mirai.onebot.dto.response.common; +import cn.evolvefield.mirai.onebot.dto.response.ActionData; import cn.evolvefield.mirai.onebot.entity.MsgId; /** @@ -8,7 +9,7 @@ * Date: 2022/10/10 0:04 * Version: 1.0 */ -public class MessageResponse extends ActionData{ +public class MessageResponse extends ActionData { public MessageResponse(int messageId){ this.setStatus("ok"); this.setRetCode(0); diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/MiraiFailure.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/MiraiFailure.java similarity index 85% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/MiraiFailure.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/MiraiFailure.java index f8cb766..b27c5d9 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/MiraiFailure.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/MiraiFailure.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response.misc; +package cn.evolvefield.mirai.onebot.dto.response.common; import cn.evolvefield.mirai.onebot.dto.response.ActionData; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/PluginFailure.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/PluginFailure.java similarity index 85% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/PluginFailure.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/PluginFailure.java index 7fedd48..8689508 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/PluginFailure.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/PluginFailure.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response.misc; +package cn.evolvefield.mirai.onebot.dto.response.common; import cn.evolvefield.mirai.onebot.dto.response.ActionData; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/PluginStatusResp.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/PluginStatusResp.java similarity index 89% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/PluginStatusResp.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/PluginStatusResp.java index 07e8adc..8c2ee81 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/PluginStatusResp.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/PluginStatusResp.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response.misc; +package cn.evolvefield.mirai.onebot.dto.response.common; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/PluginsGood.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/PluginsGood.java similarity index 83% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/PluginsGood.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/PluginsGood.java index 639a958..a518c41 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/PluginsGood.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/PluginsGood.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response.misc; +package cn.evolvefield.mirai.onebot.dto.response.common; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/VersionInfo.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/VersionInfo.java similarity index 93% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/VersionInfo.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/VersionInfo.java index 36e49f3..52f46d9 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/VersionInfo.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/common/VersionInfo.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response.misc; +package cn.evolvefield.mirai.onebot.dto.response.common; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/BooleanResp.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/BooleanResp.java similarity index 83% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/BooleanResp.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/BooleanResp.java index a618653..a5d5ebd 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/BooleanResp.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/BooleanResp.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response; +package cn.evolvefield.mirai.onebot.dto.response.misc; import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/CheckUrlSafelyResp.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/CheckUrlSafelyResp.java similarity index 80% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/CheckUrlSafelyResp.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/CheckUrlSafelyResp.java index 0a84159..a69451f 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/CheckUrlSafelyResp.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/CheckUrlSafelyResp.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response; +package cn.evolvefield.mirai.onebot.dto.response.misc; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/ClientsResp.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/ClientsResp.java similarity index 90% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/ClientsResp.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/ClientsResp.java index aba9ab9..b8d85e0 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/ClientsResp.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/ClientsResp.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response; +package cn.evolvefield.mirai.onebot.dto.response.misc; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/DownloadFileResp.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/DownloadFileResp.java similarity index 80% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/DownloadFileResp.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/DownloadFileResp.java index 55cae24..ad451c2 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/DownloadFileResp.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/DownloadFileResp.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response; +package cn.evolvefield.mirai.onebot.dto.response.misc; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/OcrResp.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/OcrResp.java similarity index 92% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/OcrResp.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/OcrResp.java index 82b11a6..03628ce 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/OcrResp.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/OcrResp.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response; +package cn.evolvefield.mirai.onebot.dto.response.misc; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/WordSlicesResp.java b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/WordSlicesResp.java similarity index 80% rename from src/main/java/cn/evolvefield/mirai/onebot/dto/response/WordSlicesResp.java rename to src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/WordSlicesResp.java index d016160..36e5857 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/dto/response/WordSlicesResp.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/dto/response/misc/WordSlicesResp.java @@ -1,4 +1,4 @@ -package cn.evolvefield.mirai.onebot.dto.response; +package cn.evolvefield.mirai.onebot.dto.response.misc; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/src/main/java/cn/evolvefield/mirai/onebot/util/ActionUtils.java b/src/main/java/cn/evolvefield/mirai/onebot/util/ActionUtils.java index 6ac3851..967af07 100644 --- a/src/main/java/cn/evolvefield/mirai/onebot/util/ActionUtils.java +++ b/src/main/java/cn/evolvefield/mirai/onebot/util/ActionUtils.java @@ -1,7 +1,7 @@ package cn.evolvefield.mirai.onebot.util; import cn.evolvefield.mirai.onebot.OneBotMirai; -import cn.evolvefield.mirai.onebot.core.MiraiApi; +import cn.evolvefield.mirai.onebot.core.ApiMap; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import org.java_websocket.WebSocket; @@ -13,7 +13,7 @@ * Version: 1.0 */ public class ActionUtils { - public static void handleWebSocketActions(WebSocket session, MiraiApi api, JSONObject json){ + public static void handleWebSocketActions(WebSocket session, ApiMap api, JSONObject json){ try { OneBotMirai.logger.info(String.format("WebSocket收到操作请求: %s", JSON.toJSONString(json))); var echo = json.getString("echo");