mirror of
https://github.com/openimsdk/open-im-server.git
synced 2026-05-09 19:45:58 +08:00
Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode
Conflicts: internal/push/sdk/tpns-server-sdk-go/go/auth/auth.go pkg/proto/group/group.proto
This commit is contained in:
+20
-15
@@ -227,17 +227,6 @@ message CancelMuteGroupReq{
|
||||
message CancelMuteGroupResp{
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
message SetGroupMemberNicknameReq{
|
||||
string groupID = 1;
|
||||
string nickname = 2;
|
||||
string userID = 3;
|
||||
}
|
||||
message SetGroupMemberNicknameResp{
|
||||
}
|
||||
|
||||
message GetJoinedSuperGroupListReq {
|
||||
string userID = 1;
|
||||
}
|
||||
@@ -254,7 +243,7 @@ message GetSuperGroupsInfoResp {
|
||||
repeated sdkws.GroupInfo groupInfos = 1;
|
||||
}
|
||||
|
||||
message SetGroupMemberInfoReq{
|
||||
message SetGroupMemberInfo{
|
||||
string groupID = 1;
|
||||
string userID = 2;
|
||||
google.protobuf.StringValue nickname = 3;
|
||||
@@ -263,6 +252,10 @@ message SetGroupMemberInfoReq{
|
||||
google.protobuf.StringValue ex = 6;
|
||||
}
|
||||
|
||||
message SetGroupMemberInfoReq{
|
||||
repeated SetGroupMemberInfo members = 1;
|
||||
}
|
||||
|
||||
message SetGroupMemberInfoResp{
|
||||
|
||||
}
|
||||
@@ -281,14 +274,25 @@ message GetGroupAbstractInfoResp{
|
||||
repeated GroupAbstractInfo groupAbstractInfos = 1;
|
||||
}
|
||||
|
||||
message getUserInGroupMembersReq {
|
||||
message GetUserInGroupMembersReq {
|
||||
string userID = 1;
|
||||
repeated string groupIDs = 2;
|
||||
}
|
||||
|
||||
message getUserInGroupMembersResp{
|
||||
repeated sdkws.GroupMemberFullInfo members = 1;
|
||||
}
|
||||
|
||||
message GetGroupMemberUserIDReq{
|
||||
string groupID = 1;
|
||||
}
|
||||
|
||||
message GetGroupMemberUserIDResp{
|
||||
repeated string userIDs = 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
service group{
|
||||
//创建群
|
||||
rpc createGroup(CreateGroupReq) returns(CreateGroupResp);
|
||||
@@ -338,13 +342,14 @@ service group{
|
||||
//获取指定的超级群信息
|
||||
rpc getSuperGroupsInfo(GetSuperGroupsInfoReq) returns (GetSuperGroupsInfoResp);
|
||||
//设置群成员昵称
|
||||
rpc setGroupMemberNickname(SetGroupMemberNicknameReq) returns (SetGroupMemberNicknameResp);
|
||||
//设置群成员信息
|
||||
rpc setGroupMemberInfo(SetGroupMemberInfoReq) returns (SetGroupMemberInfoResp);
|
||||
//获取群信息hash值
|
||||
rpc getGroupAbstractInfo(GetGroupAbstractInfoReq) returns (GetGroupAbstractInfoResp);
|
||||
//获取某个用户在指定群中的信息
|
||||
rpc getUserInGroupMembers(getUserInGroupMembersReq) returns (getUserInGroupMembersResp);
|
||||
rpc getUserInGroupMembers(GetUserInGroupMembersReq) returns (GetUserInGroupMembersResp);
|
||||
//获取群成员用户ID
|
||||
rpc getGroupMemberUserID(GetGroupMemberUserIDReq) returns (GetGroupMemberUserIDResp);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user