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

tidy code

Browse Source
This commit is contained in:
wenxu12345
2021-12-26 18:47:11 +08:00
parent 30b9ca7f37
commit 3d4e0a0479
24 changed files with 3260 additions and 2900 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/proto/base/base.proto
+5
View File
@@ -0,0 +1,5 @@
syntax = "proto3";
package base;
pkg/proto/friend/friend.pb.go
+540 -370
View File
File diff suppressed because it is too large Load Diff
pkg/proto/friend/friend.proto
+59 -46
View File
@@ -15,29 +15,26 @@ message CommID{
string FromUserID = 5;
}
message GetFriendsInfoReq{
CommID CommID = 1;
}
message GetFriendInfoResp{
int32 ErrCode = 1;
string ErrMsg = 2;
FriendInfo Data = 3;
}
message FriendInfo{
string OwnerUserID = 1;
string Remark = 2;
uint64 CreateTime = 3;
open_im_sdk.UserInfo FriendUser = 4;
int32 IsBlack = 5;
repeated open_im_sdk.FriendInfo FriendInfoList = 3;
// int32 IsBlack = 4;
}
message AddFriendReq{
CommID CommID = 1;
string ReqMessage = 2;
string ReqMsg = 2;
}
message AddFriendResp{
CommonResp CommonResp = 1;
}
message ImportFriendReq{
repeated string FriendUserIDList = 1;
@@ -45,108 +42,124 @@ message ImportFriendReq{
string FromUserID = 3;
string OpUserID = 4;
}
message ImportFriendResp{
CommonResp commonResp = 1;
repeated string failedUidList = 2;
CommonResp CommonResp = 1;
repeated string FailedFriendUserIDList = 2;
}
message GetFriendApplyReq{
message GetFriendApplyListReq{
CommID CommID = 1;
}
message GetFriendApplyResp{
message GetFriendApplyListResp{
int32 ErrCode = 1;
string ErrMsg = 2;
repeated ApplyUserInfo data = 4;
}
message ApplyUserInfo{
open_im_sdk.PublicUserInfo UserInfo = 1;
int64 applyTime = 2;
string reqMessage = 3;
int32 Flag = 4;
repeated open_im_sdk.FriendRequest FriendRequestList = 3;
}
message getFriendListReq{
message GetFriendListReq{
CommID CommID = 1;
}
message getFriendListResp{
message GetFriendListResp{
int32 ErrCode = 1;
string ErrMsg = 2;
repeated FriendInfo Data = 3;
repeated open_im_sdk.FriendInfo FriendInfoList = 3;
}
message AddBlacklistReq{
CommID CommID = 1;
}
message AddBlacklistResp{
CommonResp CommonResp = 1;
}
message RemoveBlacklistReq{
CommID CommID = 1;
}
message RemoveBlacklistResp{
CommonResp CommonResp = 1;
}
message GetBlacklistReq{
CommID CommID = 1;
}
message GetBlacklistResp{
int32 ErrCode = 1;
string ErrMsg = 2;
repeated open_im_sdk.PublicUserInfo data = 3;
repeated open_im_sdk.PublicUserInfo BlackUserInfoList = 3;
}
message IsFriendReq{
CommID CommID = 1;
}
message IsFriendResp{
int32 ErrCode = 1;
string ErrMsg = 2;
int32 ShipType = 3;
bool Response = 3;
}
message IsInBlackListReq{
CommID CommID = 1;
}
message IsInBlackListResp{
int32 ErrCode = 1;
string ErrMsg = 2;
bool Response = 3;
}
message DeleteFriendReq{
CommID CommID = 1;
}
message DeleteFriendResp{
CommonResp CommonResp = 1;
}
//process
message AddFriendResponseReq{
CommID CommID = 1;
int32 flag = 2;
string handleMsg = 3;
}
message AddFriendResponseResp{
CommonResp CommonResp = 1;
}
message SetFriendCommentReq{
CommID CommID = 1;
string Remark = 2;
}
message SetFriendCommentResp{
CommonResp CommonResp = 1;
}
message GetSelfApplyListReq{
CommID CommID = 1;
}
message GetSelfApplyListResp{
int32 ErrCode = 1;
string ErrMsg = 2;
repeated open_im_sdk.FriendRequest FriendRequestList = 3;
}
service friend{
rpc getFriendsInfo(GetFriendsInfoReq) returns(GetFriendInfoResp);
rpc addFriend(AddFriendReq) returns(CommonResp);
rpc getFriendApplyList(GetFriendApplyReq) returns(GetFriendApplyResp);
rpc getSelfApplyList(GetFriendApplyReq) returns(GetFriendApplyResp);
rpc getFriendList(getFriendListReq) returns(getFriendListResp);
rpc addBlacklist(AddBlacklistReq) returns(CommonResp);
rpc removeBlacklist(RemoveBlacklistReq) returns(CommonResp);
// rpc getFriendsInfo(GetFriendsInfoReq) returns(GetFriendInfoResp);
rpc addFriend(AddFriendReq) returns(AddFriendResp);
rpc getFriendApplyList(GetFriendApplyListReq) returns(GetFriendApplyListResp);
rpc getSelfApplyList(GetSelfApplyListReq) returns(GetSelfApplyListResp);
rpc getFriendList(GetFriendListReq) returns(GetFriendListResp);
rpc addBlacklist(AddBlacklistReq) returns(AddBlacklistResp);
rpc removeBlacklist(RemoveBlacklistReq) returns(RemoveBlacklistResp);
rpc isFriend(IsFriendReq) returns(IsFriendResp);
rpc isInBlackList(IsInBlackListReq) returns(IsInBlackListResp);
rpc getBlacklist(GetBlacklistReq) returns(GetBlacklistResp);
rpc deleteFriend(DeleteFriendReq) returns(CommonResp);
rpc addFriendResponse(AddFriendResponseReq) returns(CommonResp);
rpc setFriendComment(SetFriendCommentReq) returns(CommonResp);
rpc ImportFriend(ImportFriendReq) returns(ImportFriendResp);
rpc deleteFriend(DeleteFriendReq) returns(DeleteFriendResp);
rpc addFriendResponse(AddFriendResponseReq) returns(AddFriendResponseResp);
rpc setFriendComment(SetFriendCommentReq) returns(SetFriendCommentResp);
rpc importFriend(ImportFriendReq) returns(ImportFriendResp);
}
pkg/proto/group/group.pb.go
+330 -476
View File
File diff suppressed because it is too large Load Diff
pkg/proto/group/group.proto
+35 -67
View File
@@ -10,33 +10,29 @@ message CommonResp{
message GroupAddMemberInfo{
string UserID = 1;
int32 Role = 2;
int32 RoleLevel = 2;
}
message CreateGroupReq{
repeated GroupAddMemberInfo InitMemberList = 1; //
string GroupName = 2;
string Introduction = 3;
string Notification = 4;
string FaceUrl = 5;
string Ext = 6;
string OperationID = 7;
string OpUserID = 8; //app manager or group owner
string FromUserID = 9;
repeated GroupAddMemberInfo InitMemberList = 1;
open_im_sdk.GroupInfo GroupInfo = 2;
string OperationID = 3;
string OpUserID = 4; //app manager or group owner
string OwnerUserID = 5; //owner
}
message CreateGroupResp{
int32 ErrCode = 1;
string ErrMsg = 2;
open_im_sdk.GroupInfo GroupInfo = 3;
}
message GetGroupsInfoReq{
repeated string GroupIDList = 1;
string OperationID = 2;
string OpUserID = 3; //No verification permission
}
message GetGroupsInfoResp{
int32 ErrCode = 1;
string ErrMsg = 2;
@@ -49,44 +45,23 @@ message SetGroupInfoReq{
string OpUserID = 2; //app manager or group owner
string OperationID = 3;
}
message SetGroupInfoResp{
CommonResp CommonResp = 1;
}
message GetGroupApplicationListReq {
string OpUserID = 1; //app manager or group owner(manager)
string OperationID = 2;
string FromUserID = 3; //owner or manager (Received)
string FromUserID = 3; //owner or manager
}
message GetGroupApplicationList_Data_User {
string ID = 1;
string GroupID = 2;
string FromUserID = 3;
string ToUserID = 4;
int32 Flag = 5;
string RequestMsg = 6;
string HandledMsg = 7;
int64 AddTime = 8;
string FromUserNickname = 9;
string ToUserNickname = 10;
string FromUserFaceUrl = 11;
string ToUserFaceUrl = 12;
string HandledUser = 13;
int32 Type = 14;
int32 HandleStatus = 15;
int32 HandleResult = 16;
}
message GetGroupApplicationListData {
int32 Count = 1;
repeated GetGroupApplicationList_Data_User User = 2;
}
message GetGroupApplicationListResp {
int32 ErrCode = 1;
string ErrMsg = 2;
GetGroupApplicationListData Data = 3;
repeated open_im_sdk.GroupRequest GroupRequestList = 3;
}
message TransferGroupOwnerReq {
string GroupID = 1;
string OldOwnerUserID = 2;
@@ -94,7 +69,9 @@ message TransferGroupOwnerReq {
string OperationID = 4;
string OpUserID = 5; //app manager or group owner
}
message TransferGroupOwnerResp{
CommonResp CommonResp = 1;
}
message JoinGroupReq{
string GroupID = 1;
@@ -102,35 +79,33 @@ message JoinGroupReq{
string OpUserID = 3;
string OperationID = 4;
}
message JoinGroupResp{
CommonResp CommonResp = 1;
}
message GroupApplicationResponseReq{
string OperationID = 1;
string OpUserID = 2;
string GroupID = 3;
string FromUserID = 4; //请求加群:请求者，邀请加群:邀请人
string ToUserID = 5; //请求加群:0，邀请加群:被邀请人
int64 AddTime = 6;
string HandledMsg = 7;
int32 HandleResult = 8;
string FromUserID = 4; //
string HandledMsg = 5;
int32 HandleResult = 6;
}
message GroupApplicationResponseResp{
CommonResp CommonResp = 1;
}
message SetOwnerGroupNickNameReq{
string GroupID = 1;
string Nickname = 2;
string OperationID = 3;
string FromUserID = 4;
string OpUserID = 5; //app manger or FromUserID
}
message QuitGroupReq{
string GroupID = 1;
string OperationID = 2;
string OpUserID = 3;
}
message QuitGroupResp{
CommonResp CommonResp = 1;
}
@@ -150,7 +125,6 @@ message GetGroupMemberListResp {
}
message GetGroupMembersInfoReq {
string GroupID = 1;
repeated string memberList = 2;
@@ -189,8 +163,6 @@ message GetJoinedGroupListReq {
string operationID = 2;
string OpUserID = 3; //app manager or FromUserID
}
message GetJoinedGroupListResp{
int32 ErrCode = 1;
string ErrMsg = 2;
@@ -205,7 +177,6 @@ message InviteUserToGroupReq {
repeated string InvitedUserIDList = 5;
string OpUserID = 6; //group member or app manager
}
message InviteUserToGroupResp {
int32 ErrCode = 1;
string ErrMsg = 2;
@@ -218,7 +189,6 @@ message GetGroupAllMemberReq {
string OpUserID = 2; //No verification permission
string OperationID = 3;
}
message GetGroupAllMemberResp {
int32 ErrCode = 1;
string ErrMsg = 2;
@@ -229,20 +199,18 @@ message GetGroupAllMemberResp {
service group{
rpc createGroup(CreateGroupReq) returns(CreateGroupResp);
rpc joinGroup(JoinGroupReq) returns(CommonResp);
rpc quitGroup(QuitGroupReq) returns(CommonResp);
rpc joinGroup(JoinGroupReq) returns(JoinGroupResp);
rpc quitGroup(QuitGroupReq) returns(QuitGroupResp);
rpc getGroupsInfo(GetGroupsInfoReq) returns(GetGroupsInfoResp);
rpc setGroupInfo(SetGroupInfoReq) returns(CommonResp);
rpc setGroupInfo(SetGroupInfoReq) returns(SetGroupInfoResp);
rpc getGroupApplicationList(GetGroupApplicationListReq) returns(GetGroupApplicationListResp);
rpc transferGroupOwner(TransferGroupOwnerReq) returns(CommonResp);
rpc groupApplicationResponse(GroupApplicationResponseReq) returns(CommonResp);
// rpc setOwnerGroupNickName(SetOwnerGroupNickNameReq) returns(CommonResp);
rpc transferGroupOwner(TransferGroupOwnerReq) returns(TransferGroupOwnerResp);
rpc groupApplicationResponse(GroupApplicationResponseReq) returns(GroupApplicationResponseResp);
rpc getGroupMemberList(GetGroupMemberListReq) returns(GetGroupMemberListResp);
rpc getGroupMembersInfo(GetGroupMembersInfoReq) returns(GetGroupMembersInfoResp);
rpc kickGroupMember(KickGroupMemberReq) returns (KickGroupMemberResp);
rpc getJoinedGroupList(GetJoinedGroupListReq) returns (GetJoinedGroupListResp);
rpc inviteUserToGroup(InviteUserToGroupReq) returns (InviteUserToGroupResp);
rpc getGroupAllMember(GetGroupAllMemberReq) returns(GetGroupAllMemberResp);
}
pkg/proto/sdk_ws/ws.pb.go
+959 -586
View File
File diff suppressed because it is too large Load Diff
pkg/proto/sdk_ws/ws.proto
+134 -80
View File
@@ -2,6 +2,102 @@ syntax = "proto3";
package open_im_sdk;//The package name to which the proto file belongs
//option go_package = "./sdk_ws;open_im_sdk";//The generated go pb file is in the current directory, and the package name is open_im_sdk
////////////////////////////////base///////////////////////////////
message GroupInfo{
string GroupID = 1;
string GroupName = 2;
string Notification = 3;
string Introduction = 4;
string FaceUrl = 5;
string OwnerUserID = 6;
int64 CreateTime = 7;
uint32 MemberCount = 8;
string Ex = 9;
int32 Status = 10;
string CreatorUserID = 11;
int32 GroupType = 12;
}
message GroupMemberFullInfo {
string GroupID = 1 ;
string UserID = 2 ;
int32 roleLevel = 3;
int64 JoinTime = 4;
string NickName = 5;
string FaceUrl = 6;
string FriendRemark = 7;
int32 AppMangerLevel = 8; //if >0
int32 JoinSource = 9;
string OperatorUserID = 10;
string Ex = 11;
}
message PublicUserInfo{
string UserID = 1;
string Nickname = 2;
string FaceUrl = 3;
int32 Gender = 4;
int32 AppMangerLevel = 5; //if >0
}
message UserInfo{
string UserID = 1;
string Nickname = 2;
string FaceUrl = 3;
int32 Gender = 4;
string PhoneNumber = 5;
string Birth = 6;
string Email = 7;
string Ex = 8;
}
message FriendInfo{
string OwnerUserID = 1;
string Remark = 2;
int64 CreateTime = 3;
UserInfo FriendUser = 4;
int32 AddSource = 5;
string OperatorUserID = 6;
string Ex = 7;
}
message BlackInfo{
string OwnerUserID = 1;
int64 CreateTime = 2;
PublicUserInfo BlackUserInfo = 4;
int32 AddSource = 5;
string OperatorUserID = 6;
string Ex = 7;
}
message GroupRequest{
string UserID = 1;
string GroupID = 2;
string HandleResult = 3;
string ReqMsg = 4;
string HandleMsg = 5;
int64 ReqTime = 6;
string HandleUserID = 7;
int64 HandleTime = 8;
string Ex = 9;
}
message FriendRequest{
string FromUserID = 1;
string ToUserID = 2;
int32 HandleResult = 3;
string ReqMsg = 4;
int64 CreateTime = 5;
string HandlerUserID = 6;
string HandleMsg = 7;
int64 HandleTime = 8;
string Ex = 9;
}
///////////////////////////////////base end/////////////////////////////////////
message PullMessageBySeqListResp {
int32 errCode = 1;
@@ -14,7 +110,7 @@ message PullMessageBySeqListResp {
message PullMessageBySeqListReq{
string userID = 1;
string operationID = 2;
repeated int64 seqList =3;
repeated int64 seqList = 3;
}
message PullMessageReq {
string userID = 1;
@@ -80,76 +176,38 @@ message MsgData {
string sendID = 1;
string recvID = 2;
string groupID = 3;
string clientMsgID =4;
string serverMsgID =5;
int32 senderPlatformID =6;
string senderNickName =7;
string senderFaceURL =8;
string clientMsgID = 4;
string serverMsgID = 5;
int32 senderPlatformID = 6;
string senderNickname = 7;
string senderFaceURL = 8;
int32 sessionType = 9;
int32 msgFrom = 10;
int32 contentType = 11;
bytes content =12;
bytes content = 12;
repeated string forceList = 13;
int64 seq =14;
int64 seq = 14;
int64 sendTime = 15;
int64 createTime = 16;
map<string,bool> Options= 17;
OfflinePushInfo offlinePushInfo =18;
map<string, bool> Options = 17;
OfflinePushInfo offlinePushInfo = 18;
}
message OfflinePushInfo{
string Title = 1;
string Desc = 2;
string Ext = 3;
string iOSPushSound = 4;
bool iOSBadgeCount = 5;
}
//public
message GroupInfo{
string GroupID = 1;
string GroupName = 2;
string Notification = 3;
string Introduction = 4;
string FaceUrl = 5;
PublicUserInfo Owner = 6;
uint64 CreateTime = 7;
uint32 MemberCount = 8;
string Ext = 9;
string Title = 1;
string Desc = 2;
string Ex = 3;
string iOSPushSound = 4;
bool iOSBadgeCount = 5;
}
//private, Group members have permission to view
message GroupMemberFullInfo {
string GroupID = 1 ;
string UserID = 2 ;
int32 AdministratorLevel = 3;
uint64 JoinTime = 4;
string NickName = 5;
string FaceUrl = 6;
string FriendRemark = 7;
int32 AppMangerLevel = 8; // >0
}
//private, Friends have permission to view
message UserInfo{
string UserID = 1;
string Nickname = 2;
string FaceUrl = 3;
int32 Gender = 4;
string Mobile = 5;
string Birth = 6;
string Email = 7;
string Ext = 8;
}
//No permissions required
message PublicUserInfo{
string UserID = 1;
string Nickname = 2;
string FaceUrl = 3;
int32 Gender = 4;
}
message TipsComm{
bytes Detail = 1;
@@ -161,35 +219,35 @@ message TipsComm{
message MemberEnterTips{
GroupInfo Group = 1;
GroupMemberFullInfo EntrantUser = 2;
uint64 OperationTime = 3;
int64 OperationTime = 3;
}
//Actively leave the group
message MemberLeaveTips{
GroupInfo Group = 1;
GroupMemberFullInfo LeaverUser = 2;
uint64 OperationTime = 3;
int64 OperationTime = 3;
}
message MemberInvitedTips{
GroupInfo Group = 1;
GroupMemberFullInfo OpUser = 2;
repeated GroupMemberFullInfo InvitedUserList = 3;
uint64 OperationTime = 4;
int64 OperationTime = 4;
}
message MemberKickedTips{
GroupInfo Group = 1;
GroupMemberFullInfo OpUser = 2;
repeated GroupMemberFullInfo KickedUserList = 3;
uint64 OperationTime = 4;
int64 OperationTime = 4;
}
message MemberInfoChangedTips{
int32 ChangeType = 1; ///bitwise operators 0001:member info changed; 0010:mute ;
GroupMemberFullInfo OpUser = 2; //who do this
GroupMemberFullInfo FinalInfo = 3; //
uint64 MuteTime = 4;
int64 MuteTime = 4;
GroupInfo Group = 5;
}
@@ -197,7 +255,7 @@ message GroupCreatedTips{
GroupInfo Group = 1;
GroupMemberFullInfo Creator = 2;
repeated GroupMemberFullInfo MemberList = 3;
uint64 OperationTime = 4;
int64 OperationTime = 4;
}
message GroupInfoChangedTips{
@@ -208,27 +266,27 @@ message GroupInfoChangedTips{
message JoinGroupApplicationTips{
GroupInfo Group = 1;
PublicUserInfo Applicant = 2;
string Reason = 3;
PublicUserInfo Applicant = 2;
string Reason = 3;
}
message ApplicationProcessedTips{
GroupInfo Group = 1;
GroupMemberFullInfo OpUser = 2;
int32 Result = 3;
string Reason = 4;
string Reason = 4;
}
//////////////////////friend/////////////////////
message FriendInfo{
UserInfo OwnerUser = 1;
string Remark = 2;
uint64 CreateTime = 3;
UserInfo FriendUser = 4;
}
//message FriendInfo{
// UserInfo OwnerUser = 1;
// string Remark = 2;
// uint64 CreateTime = 3;
// UserInfo FriendUser = 4;
//}
message FriendApplication{
uint64 AddTime = 1;
int64 AddTime = 1;
string AddSource = 2;
string AddWording = 3;
}
@@ -240,7 +298,7 @@ message FromToUserID{
//FromUserID apply to add ToUserID
message FriendApplicationAddedTips{
FromToUserID FromToUserID = 1;
FromToUserID FromToUserID = 1;
}
//FromUserID accept or reject ToUserID
@@ -251,7 +309,7 @@ message FriendApplicationProcessedTips{
// FromUserID Added a friend ToUserID
message FriendAddedTips{
FriendInfo Friend = 1;
uint64 OperationTime = 2;
int64 OperationTime = 2;
PublicUserInfo OpUser = 3; //who do this
}
@@ -261,11 +319,7 @@ message FriendDeletedTips{
FromToUserID FromToUserID = 1;
}
//message BlackInfo{
// PublicUserInfo OwnerUser = 1;
// uint64 CreateTime = 3;
// PublicUserInfo BlackUser = 4;
//}
message BlackAddedTips{
FromToUserID FromToUserID = 1;