From 1374e674b73eb1919aefbaf32b2a84364babe6a1 Mon Sep 17 00:00:00 2001 From: cosmo Date: Tue, 5 Dec 2023 01:26:29 +0800 Subject: [PATCH 1/3] beta77 --- handlers/send_group_msg.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/handlers/send_group_msg.go b/handlers/send_group_msg.go index f2e5258e..bda0e112 100644 --- a/handlers/send_group_msg.go +++ b/handlers/send_group_msg.go @@ -197,7 +197,7 @@ func handleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap mylog.Printf("发送组合消息失败: %v", err) return // 或其他错误处理 } - if ret.Message.Ret == 22009 { + if ret != nil && ret.Message.Ret == 22009 { mylog.Printf("信息发送失败,加入到队列中,下次被动信息进行发送") var pair echo.MessageGroupPair pair.Group = message.Params.GroupID.(string) @@ -231,7 +231,7 @@ func handleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap if err != nil { mylog.Printf("发送文本群组信息失败: %v", err) } - if ret.Message.Ret == 22009 { + if ret != nil && ret.Message.Ret == 22009 { mylog.Printf("信息发送失败,加入到队列中,下次被动信息进行发送") var pair echo.MessageGroupPair pair.Group = message.Params.GroupID.(string) @@ -276,7 +276,7 @@ func handleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap if err != nil { mylog.Printf("发送文本报错信息失败: %v", err) } - if ret.Message.Ret == 22009 { + if ret != nil && ret.Message.Ret == 22009 { mylog.Printf("信息发送失败,加入到队列中,下次被动信息进行发送") var pair echo.MessageGroupPair pair.Group = message.Params.GroupID.(string) @@ -304,7 +304,7 @@ func handleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap if err != nil { mylog.Printf("发送图片失败: %v", err) } - if ret.Message.Ret == 22009 { + if ret != nil && ret.Message.Ret == 22009 { mylog.Printf("信息发送失败,加入到队列中,下次被动信息进行发送") var pair echo.MessageGroupPair pair.Group = message.Params.GroupID.(string) @@ -759,7 +759,7 @@ func SendStackMessages(apiv2 openapi.OpenAPI, messageid string, originalGroupID } // 检查错误码 - if ret.Message.Ret == 22009 { + if ret != nil && ret.Message.Ret == 22009 { mylog.Printf("信息再次发送失败,加入到队列中,下次被动信息进行发送") echo.PushGlobalStack(pair) } From ddd33c38f04a053680ff0e886f49920420c2b4f4 Mon Sep 17 00:00:00 2001 From: cosmo Date: Tue, 5 Dec 2023 01:37:33 +0800 Subject: [PATCH 2/3] beta77 --- handlers/send_group_msg.go | 1 + 1 file changed, 1 insertion(+) diff --git a/handlers/send_group_msg.go b/handlers/send_group_msg.go index bda0e112..1cab51fb 100644 --- a/handlers/send_group_msg.go +++ b/handlers/send_group_msg.go @@ -116,6 +116,7 @@ func handleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap message.Params.GroupID = originalGroupID if SSM { mylog.Printf("正在使用Msgid:%v 补发之前失败的主动信息,请注意AtoP不要设置超过3,否则可能会影响正常信息发送", messageID) + mylog.Printf("originalGroupID:%v ", originalGroupID) SendStackMessages(apiv2, messageID, originalGroupID) } mylog.Println("群组发信息messageText:", messageText) From 43c88a3de56ece59a62c823f011f94e919600c4d Mon Sep 17 00:00:00 2001 From: cosmo Date: Tue, 5 Dec 2023 01:48:31 +0800 Subject: [PATCH 3/3] beta77 --- handlers/send_group_msg.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/handlers/send_group_msg.go b/handlers/send_group_msg.go index 1cab51fb..b1d2e562 100644 --- a/handlers/send_group_msg.go +++ b/handlers/send_group_msg.go @@ -115,8 +115,8 @@ func handleSendGroupMsg(client callapi.Client, api openapi.OpenAPI, apiv2 openap } message.Params.GroupID = originalGroupID if SSM { - mylog.Printf("正在使用Msgid:%v 补发之前失败的主动信息,请注意AtoP不要设置超过3,否则可能会影响正常信息发送", messageID) - mylog.Printf("originalGroupID:%v ", originalGroupID) + //mylog.Printf("正在使用Msgid:%v 补发之前失败的主动信息,请注意AtoP不要设置超过3,否则可能会影响正常信息发送", messageID) + //mylog.Printf("originalGroupID:%v ", originalGroupID) SendStackMessages(apiv2, messageID, originalGroupID) } mylog.Println("群组发信息messageText:", messageText) @@ -744,8 +744,10 @@ func uploadMedia(ctx context.Context, groupID string, richMediaMessage *dto.Rich // 发送栈中的消息 func SendStackMessages(apiv2 openapi.OpenAPI, messageid string, originalGroupID string) { count := config.GetAtoPCount() + mylog.Printf("取出数量: %v", count) pairs := echo.PopGlobalStackMulti(count) for _, pair := range pairs { + mylog.Printf("%v: %v", pair.Group, originalGroupID) if pair.Group == originalGroupID { // 发送消息 messageID := pair.GroupMessage.MsgID