mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-05-05 09:36:00 +08:00
merge v3dev into main (#504)
* statistics user register * refactor: router change * minio init * UserRegisterCount * push use local conn * refactor: user pb update * remove online push close grpc conn * refactor: user pb update * refactor:pb file * msgs statistics * msgs statistics * revoke userID * refactor: errcode update * active user * active user * active user * refactor: errcode update * feat: conn update token * active user * active user * feat: conn update token * active user * feat: conn update token * feat: conn update token * feat: conn update token * add tx_oss cos * active user * active user * group create * group create * feat: group notification show to conversation * feat: group notification show to conversation * group active * user active * sendNotificationWithName * withname * privateChat * a2r call option * grpc with detail return error * change log error * chain unary interceptor * api nil slice map * fix sync has read * fix: text update * fix: update add model * set conversations update * set privateChat * fix: content update * remove unuse rpc * msgDestruct * cron use rpc mw * set IsMsgDestruct * msg destruct * msgDestruct * s3 minio, cos, oss support * feat: add implement of GetUsersOnlineStatus, #472 (#477) * s3 minio, cos, oss support * s3 route * remove extendMsg code * s3 route * remove unuse code * s3 pb * s3 pb * s3 pb * s3 presigned put * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * s3 presigned test * Update .gitignore (#482) * s3 debug log * s3 debug log * cron add log and fix cron * add log * cron * s3 config * fix kick user bug * s3 cos * add kick log * s3 cos test * s3 cos test * s3 cos test * kick user log * kickuserlog * s3 cos copy * s3 cos copy * s3 url * s3 url * s3 AccessURL * log * s3 InitiateMultipartUpload add ExpireTime --------- Co-authored-by: withchao <993506633@qq.com> Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com> Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com> Co-authored-by: withchao <48119764+withchao@users.noreply.github.com> Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com>
This commit is contained in:
Gordon
+45
-95
@@ -15,7 +15,7 @@
|
||||
syntax = "proto3";
|
||||
package OpenIMServer.msg;
|
||||
import "sdkws/sdkws.proto";
|
||||
import "wrapperspb/wrapperspb.proto";
|
||||
// import "wrapperspb/wrapperspb.proto";
|
||||
option go_package = "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg";
|
||||
|
||||
message MsgDataToMQ{
|
||||
@@ -74,93 +74,6 @@ message GetSendMsgStatusResp{
|
||||
}
|
||||
|
||||
|
||||
message ModifyMessageReactionExtensionsReq {
|
||||
string conversationID = 1;
|
||||
int32 sessionType = 2;
|
||||
map <string, sdkws.KeyValue>reactionExtensions = 3;
|
||||
string clientMsgID = 4;
|
||||
OpenIMServer.protobuf.StringValue ex = 5;
|
||||
OpenIMServer.protobuf.StringValue attachedInfo = 6;
|
||||
bool isReact = 7;
|
||||
bool isExternalExtensions = 8;
|
||||
int64 msgFirstModifyTime = 9;
|
||||
}
|
||||
message SetMessageReactionExtensionsReq {
|
||||
string conversationID = 1;
|
||||
int32 sessionType = 2;
|
||||
map <string, sdkws.KeyValue>reactionExtensions = 3;
|
||||
string clientMsgID = 4;
|
||||
OpenIMServer.protobuf.StringValue ex = 5;
|
||||
OpenIMServer.protobuf.StringValue attachedInfo = 6;
|
||||
bool isReact = 7;
|
||||
bool isExternalExtensions = 8;
|
||||
int64 msgFirstModifyTime = 9;
|
||||
}
|
||||
message SetMessageReactionExtensionsResp {
|
||||
string clientMsgID = 1;
|
||||
int64 msgFirstModifyTime = 2;
|
||||
bool isReact = 3;
|
||||
repeated KeyValueResp result = 4;
|
||||
}
|
||||
|
||||
message GetMessagesReactionExtensionsReq {
|
||||
string conversationID = 1;
|
||||
int32 sessionType = 2;
|
||||
message MessageReactionKey {
|
||||
string clientMsgID = 1;
|
||||
int64 msgFirstModifyTime = 2;
|
||||
}
|
||||
repeated MessageReactionKey messageReactionKeys = 3;
|
||||
repeated string TypeKeys = 4;
|
||||
}
|
||||
message GetMessagesReactionExtensionsResp{
|
||||
repeated SingleMessageExtensionResult singleMessageResult = 1;
|
||||
|
||||
}
|
||||
message SingleMessageExtensionResult {
|
||||
map <string, sdkws.KeyValue>reactionExtensions = 1;
|
||||
string clientMsgID = 2;
|
||||
}
|
||||
|
||||
|
||||
message ModifyMessageReactionExtensionsResp {
|
||||
repeated ExtendMsgResp successList = 1;
|
||||
repeated ExtendMsgResp failedList = 2;
|
||||
}
|
||||
|
||||
message DeleteMessagesReactionExtensionsReq {
|
||||
string operationID = 1;
|
||||
string opUserID = 2;
|
||||
string conversationID = 3;
|
||||
int32 sessionType = 4;
|
||||
string clientMsgID = 5;
|
||||
bool isExternalExtensions = 6;
|
||||
int64 msgFirstModifyTime = 7;
|
||||
repeated sdkws.KeyValue reactionExtensions = 8;
|
||||
}
|
||||
|
||||
message DeleteMessagesReactionExtensionsResp {
|
||||
repeated KeyValueResp result = 1;
|
||||
}
|
||||
|
||||
message ExtendMsgResp {
|
||||
ExtendMsg extendMsg = 1;
|
||||
}
|
||||
|
||||
message ExtendMsg {
|
||||
map <string, KeyValueResp>reactionExtensions = 1;
|
||||
string clientMsgID = 2;
|
||||
int64 msgFirstModifyTime = 3;
|
||||
string attachedInfo = 4;
|
||||
string ex = 5;
|
||||
}
|
||||
|
||||
message KeyValueResp {
|
||||
sdkws.KeyValue keyValue = 1;
|
||||
int32 errCode = 2;
|
||||
string errMsg = 3;
|
||||
}
|
||||
|
||||
message MsgDataToModifyByMQ{
|
||||
repeated sdkws.MsgData messages = 1;
|
||||
string conversationID = 2;
|
||||
@@ -255,7 +168,7 @@ message DeleteMsgPhysicalBySeqReq {
|
||||
}
|
||||
|
||||
message DeleteMsgPhysicalBySeqResp {
|
||||
|
||||
|
||||
}
|
||||
|
||||
message GetConversationMaxSeqReq {
|
||||
@@ -280,6 +193,45 @@ message GetConversationsHasReadAndMaxSeqResp {
|
||||
map<string, Seqs> seqs = 1;
|
||||
}
|
||||
|
||||
message GetActiveUserReq {
|
||||
int64 start = 1;
|
||||
int64 end = 2;
|
||||
bool ase = 3;
|
||||
bool group = 4;
|
||||
sdkws.RequestPagination pagination = 5;
|
||||
}
|
||||
|
||||
message ActiveUser {
|
||||
sdkws.UserInfo user = 1;
|
||||
int64 count = 2;
|
||||
}
|
||||
|
||||
message GetActiveUserResp {
|
||||
int64 msgCount = 1;
|
||||
int64 userCount = 2;
|
||||
map<string, int64> dateCount = 3;
|
||||
repeated ActiveUser users = 4;
|
||||
}
|
||||
|
||||
message GetActiveGroupReq {
|
||||
int64 start = 1;
|
||||
int64 end = 2;
|
||||
bool ase = 3;
|
||||
sdkws.RequestPagination pagination = 4;
|
||||
}
|
||||
|
||||
message ActiveGroup {
|
||||
sdkws.GroupInfo group = 1;
|
||||
int64 count = 2;
|
||||
}
|
||||
|
||||
message GetActiveGroupResp {
|
||||
int64 msgCount = 1;
|
||||
int64 groupCount = 2;
|
||||
map<string, int64> dateCount = 3;
|
||||
repeated ActiveGroup groups = 4;
|
||||
}
|
||||
|
||||
service msg {
|
||||
//获取最小最大seq（包括用户的，以及指定群组的）
|
||||
rpc GetMaxSeq(sdkws.GetMaxSeqReq) returns(sdkws.GetMaxSeqResp);
|
||||
@@ -309,11 +261,9 @@ service msg {
|
||||
rpc MarkMsgsAsRead(MarkMsgsAsReadReq) returns(MarkMsgsAsReadResp);
|
||||
rpc MarkConversationAsRead(MarkConversationAsReadReq) returns(MarkConversationAsReadResp);
|
||||
rpc SetConversationHasReadSeq(SetConversationHasReadSeqReq) returns(SetConversationHasReadSeqResp);
|
||||
// 修改消息
|
||||
rpc SetMessageReactionExtensions(SetMessageReactionExtensionsReq) returns(SetMessageReactionExtensionsResp);
|
||||
rpc GetMessagesReactionExtensions(GetMessagesReactionExtensionsReq) returns(GetMessagesReactionExtensionsResp);
|
||||
rpc AddMessageReactionExtensions(ModifyMessageReactionExtensionsReq) returns(ModifyMessageReactionExtensionsResp);
|
||||
rpc DeleteMessageReactionExtensions(DeleteMessagesReactionExtensionsReq) returns(DeleteMessagesReactionExtensionsResp);
|
||||
|
||||
|
||||
rpc GetConversationsHasReadAndMaxSeq(GetConversationsHasReadAndMaxSeqReq) returns(GetConversationsHasReadAndMaxSeqResp);
|
||||
|
||||
rpc GetActiveUser(GetActiveUserReq) returns(GetActiveUserResp);
|
||||
rpc GetActiveGroup(GetActiveGroupReq) returns(GetActiveGroupResp);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user