IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source 
# Conflicts:
#	internal/msgtransfer/init.go
#	internal/msgtransfer/online_history_msg_handler.go
#	internal/msgtransfer/online_msg_to_mongo_handler.go
#	pkg/common/db/controller/msg.go
#	pkg/proto/msg/msg.pb.go
#	pkg/proto/msg/msg.proto
This commit is contained in:
withchao
2023-04-28 18:45:28 +08:00
parent 7a7a912352 d855beb354
commit 3b5ab4cb41
29 changed files with 875 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/proto/msg/msg.proto
+2 -3
View File
@@ -21,8 +21,7 @@ message PushMsgDataToMQ{
message MsgDataToMongoByMQ{
int64 lastSeq = 1;
string aggregationID = 2;
// repeated MsgDataToMQ messages = 3;
string sourceID = 2;
repeated sdkws.MsgData msgData = 3;
string triggerID = 4;
}
@@ -189,7 +188,7 @@ message KeyValueResp {
message MsgDataToModifyByMQ{
repeated sdkws.MsgData messages = 1;
string triggerID = 2;
string aggregationID = 3;
string sourceID = 3;
}
message DelMsgsReq{