diff --git a/src/main/java/com/mikuac/shiro/common/utils/ShiroUtils.java b/src/main/java/com/mikuac/shiro/common/utils/ShiroUtils.java index 2d3a4d6..745aaca 100644 --- a/src/main/java/com/mikuac/shiro/common/utils/ShiroUtils.java +++ b/src/main/java/com/mikuac/shiro/common/utils/ShiroUtils.java @@ -6,9 +6,7 @@ import com.mikuac.shiro.enums.ShiroUtilsEnum; import lombok.extern.slf4j.Slf4j; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; /** * Created on 2021/8/10. @@ -185,12 +183,12 @@ public static List stringToMsgChain(String msg) { * https://docs.go-cqhttp.org/cqcode/#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91 * @return 转发消息 */ - public static JSONArray generateForwardMsg(long uin, String name, ArrayList msgList) { - JSONArray nodeList = new JSONArray(); + public static List generateForwardMsg(long uin, String name, ArrayList msgList) { + List nodeList = new ArrayList<>(); for (String msg : msgList) { - JSONObject node = new JSONObject(); + Map node = new HashMap<>(5); node.put("type", "node"); - JSONObject data = new JSONObject(); + Map data = new HashMap<>(5); data.put("name", name); data.put("uin", uin); data.put("content", msg); diff --git a/src/main/java/com/mikuac/shiro/core/Bot.java b/src/main/java/com/mikuac/shiro/core/Bot.java index a71d3d6..4355c11 100644 --- a/src/main/java/com/mikuac/shiro/core/Bot.java +++ b/src/main/java/com/mikuac/shiro/core/Bot.java @@ -1,6 +1,5 @@ package com.mikuac.shiro.core; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.mikuac.shiro.bean.HandlerMethod; @@ -685,10 +684,11 @@ public ActionData downloadFile(String url) { * 发送合并转发 (群) * * @param groupId 群号 - * @param msg 自定义转发消息, 具体看 https://docs.go-cqhttp.org/cqcode/#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91 + * @param msg 自定义转发消息 (可使用 ShiroUtils.generateForwardMsg() 方法创建) + * 自定义构建详见 https://docs.go-cqhttp.org/cqcode/#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91 * @return {@link ActionRaw} */ - public ActionRaw sendGroupForwardMsg(long groupId, JSONArray msg) { + public ActionRaw sendGroupForwardMsg(long groupId, List msg) { ActionPathEnum action = ActionPathEnum.SEND_GROUP_FORWARD_MSG; JSONObject params = new JSONObject(); params.put("group_id", groupId);