Merge remote-tracking branch 'origin/modify' into v2.3.0release

# Conflicts:
#	config/config.yaml
#	pkg/common/constant/constant.go
#	pkg/proto/sdk_ws/ws.pb.go
#	pkg/proto/sdk_ws/ws.proto
This commit is contained in:
Gordon
2022-12-23 16:16:28 +08:00
24 changed files with 2741 additions and 217 deletions
+17 -15
View File
@@ -709,25 +709,27 @@ message SetAppBackgroundStatusResp {
}
message ExtendMsgSet {
string ID = 1;
// repeated ExtendMsg extendMsgs = 2;
int32 latestUpdateTime = 3;
string sourceID = 1;
int32 sessionType = 2;
map <string, ExtendMsg>extendMsgs = 3;
int64 MaxMsgUpdateTime = 4;
int32 extendMsgNum = 5;
int64 createTime = 6;
}
message ExtendMsg {
map <string, KeyValue>reactionExtensionList = 1;
string clientMsgID = 2;
int64 msgFirstModifyTime = 3;
string attachedInfo = 4;
string ex = 5;
int32 extendMsgNum = 6;
int32 createTime = 7;
}
//message ExtendMsg {
// repeated ReactionExtendMsgSet content = 1;
// string clientMsgID = 2;
// int32 createTime = 3;
// int32 latestUpdateTime = 4;
//}
message ReactionExtendMsgSet {
string userKey = 1;
message KeyValue {
string typeKey = 1;
string value = 2;
int32 latestUpdateTime = 3;
int64 latestUpdateTime = 3;
}