From d49022c16a73811ee37f3c911b89b42b2617b960 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 29 Jan 2023 19:19:03 +0800 Subject: [PATCH] Error code standardization --- pkg/common/utils/utils.go | 160 ---------------------------------- pkg/proto/friend/friend.proto | 15 +++- 2 files changed, 13 insertions(+), 162 deletions(-) delete mode 100644 pkg/common/utils/utils.go diff --git a/pkg/common/utils/utils.go b/pkg/common/utils/utils.go deleted file mode 100644 index fd8d43fac..000000000 --- a/pkg/common/utils/utils.go +++ /dev/null @@ -1,160 +0,0 @@ -package utils - -import ( - imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" - "Open_IM/pkg/common/token_verify" - open_im_sdk "Open_IM/pkg/proto/sdk_ws" - "Open_IM/pkg/utils" - "math/rand" - "strconv" - "time" -) - -func OperationIDGenerator() string { - return strconv.FormatInt(time.Now().UnixNano()+int64(rand.Uint32()), 10) -} - -func FriendOpenIMCopyDB(dst *imdb.Friend, src *open_im_sdk.FriendInfo) { - utils.CopyStructFields(dst, src) - dst.FriendUserID = src.FriendUser.UserID - dst.CreateTime = utils.UnixSecondToTime(int64(src.CreateTime)) -} - -func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src *imdb.Friend) error { - utils.CopyStructFields(dst, src) - user, err := imdb.GetUserByUserID(src.FriendUserID) - if err != nil { - return utils.Wrap(err, "") - } - utils.CopyStructFields(dst.FriendUser, user) - dst.CreateTime = uint32(src.CreateTime.Unix()) - if dst.FriendUser == nil { - dst.FriendUser = &open_im_sdk.UserInfo{} - } - dst.FriendUser.CreateTime = uint32(user.CreateTime.Unix()) - return nil -} - -func FriendRequestOpenIMCopyDB(dst *imdb.FriendRequest, src *open_im_sdk.FriendRequest) { - utils.CopyStructFields(dst, src) - dst.CreateTime = utils.UnixSecondToTime(int64(src.CreateTime)) - dst.HandleTime = utils.UnixSecondToTime(int64(src.HandleTime)) -} - -func FriendRequestDBCopyOpenIM(dst *open_im_sdk.FriendRequest, src *imdb.FriendRequest) error { - utils.CopyStructFields(dst, src) - user, err := imdb.GetUserByUserID(src.FromUserID) - if err != nil { - return utils.Wrap(err, "") - } - dst.FromNickname = user.Nickname - dst.FromFaceURL = user.FaceURL - dst.FromGender = user.Gender - user, err = imdb.GetUserByUserID(src.ToUserID) - if err != nil { - return utils.Wrap(err, "") - } - dst.ToNickname = user.Nickname - dst.ToFaceURL = user.FaceURL - dst.ToGender = user.Gender - dst.CreateTime = uint32(src.CreateTime.Unix()) - dst.HandleTime = uint32(src.HandleTime.Unix()) - return nil -} - -func BlackOpenIMCopyDB(dst *imdb.Black, src *open_im_sdk.BlackInfo) { - utils.CopyStructFields(dst, src) - dst.BlockUserID = src.BlackUserInfo.UserID - dst.CreateTime = utils.UnixSecondToTime(int64(src.CreateTime)) -} - -func BlackDBCopyOpenIM(dst *open_im_sdk.BlackInfo, src *imdb.Black) error { - utils.CopyStructFields(dst, src) - dst.CreateTime = uint32(src.CreateTime.Unix()) - user, err := imdb.GetUserByUserID(src.BlockUserID) - if err != nil { - return utils.Wrap(err, "") - } - utils.CopyStructFields(dst.BlackUserInfo, user) - return nil -} - -func GroupOpenIMCopyDB(dst *imdb.Group, src *open_im_sdk.GroupInfo) { - utils.CopyStructFields(dst, src) -} - -func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src *imdb.Group) error { - utils.CopyStructFields(dst, src) - user, err := imdb.GetGroupOwnerInfoByGroupID(src.GroupID) - if err != nil { - return utils.Wrap(err, "") - } - dst.OwnerUserID = user.UserID - - memberCount, err := imdb.GetGroupMemberNumByGroupID(src.GroupID) - dst.MemberCount = uint32(memberCount) - if err != nil { - return utils.Wrap(err, "") - } - dst.CreateTime = uint32(src.CreateTime.Unix()) - dst.NotificationUpdateTime = uint32(src.NotificationUpdateTime.Unix()) - if src.NotificationUpdateTime.Unix() < 0 { - dst.NotificationUpdateTime = 0 - } - return nil -} - -func GroupMemberOpenIMCopyDB(dst *imdb.GroupMember, src *open_im_sdk.GroupMemberFullInfo) { - utils.CopyStructFields(dst, src) -} - -func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *imdb.GroupMember) error { - utils.CopyStructFields(dst, src) - if token_verify.IsManagerUserID(src.UserID) { - u, err := imdb.GetUserByUserID(src.UserID) - if err != nil { - return utils.Wrap(err, "") - } - - utils.CopyStructFields(dst, u) - - dst.AppMangerLevel = 1 - } - dst.JoinTime = int32(src.JoinTime.Unix()) - if src.JoinTime.Unix() < 0 { - dst.JoinTime = 0 - return nil - } - dst.MuteEndTime = uint32(src.MuteEndTime.Unix()) - if dst.MuteEndTime < uint32(time.Now().Unix()) { - dst.MuteEndTime = 0 - } - return nil -} - -func GroupRequestOpenIMCopyDB(dst *imdb.GroupRequest, src *open_im_sdk.GroupRequest) { - utils.CopyStructFields(dst, src) -} - -func GroupRequestDBCopyOpenIM(dst *open_im_sdk.GroupRequest, src *imdb.GroupRequest) { - utils.CopyStructFields(dst, src) - dst.ReqTime = uint32(src.ReqTime.Unix()) - dst.HandleTime = uint32(src.HandledTime.Unix()) -} - -func UserOpenIMCopyDB(dst *imdb.User, src *open_im_sdk.UserInfo) { - utils.CopyStructFields(dst, src) - dst.Birth, _ = utils.TimeStringToTime(src.BirthStr) - dst.CreateTime = utils.UnixSecondToTime(int64(src.CreateTime)) -} - -func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src *imdb.User) { - utils.CopyStructFields(dst, src) - dst.CreateTime = uint32(src.CreateTime.Unix()) - //dst.Birth = uint32(src.Birth.Unix()) - dst.BirthStr = utils.TimeToString(src.Birth) -} - -func UserDBCopyOpenIMPublicUser(dst *open_im_sdk.PublicUserInfo, src *imdb.User) { - utils.CopyStructFields(dst, src) -} diff --git a/pkg/proto/friend/friend.proto b/pkg/proto/friend/friend.proto index 56158cb11..ada85b2fc 100644 --- a/pkg/proto/friend/friend.proto +++ b/pkg/proto/friend/friend.proto @@ -18,7 +18,6 @@ message AddFriendReq{ string ReqMsg = 3; } message AddFriendResp{ - server_api_params.CommonResp commonResp = 1; } @@ -33,7 +32,6 @@ message ImportFriendResp{ message GetFriendApplyListReq{ string ToUserID = 1; - string FromUserID = 2; } message GetFriendApplyListResp{ repeated server_api_params.FriendRequest FriendRequestList = 1; @@ -129,17 +127,30 @@ message GetSelfApplyListResp{ } service friend{ + //申请加好友 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(DeleteFriendResp); + //对好友申请响应（同意或拒绝） rpc addFriendResponse(AddFriendResponseReq) returns(AddFriendResponseResp); + //设置好友备注 rpc setFriendRemark(SetFriendRemarkReq) returns(SetFriendRemarkResp); + //导入好友关系 rpc importFriend(ImportFriendReq) returns(ImportFriendResp); } \ No newline at end of file