From 20aa2bdc6e083b983436025e1020e2c3b3a7bdf5 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Wed, 29 Dec 2021 14:25:39 +0800 Subject: [PATCH] Refactor code --- cmd/open_im_api/main.go | 4 +- internal/api/friend/friend.go | 8 +- internal/rpc/friend/firend.go | 8 +- pkg/base_info/friend_api_struct.go | 4 +- pkg/proto/friend/friend.pb.go | 270 ++++++++++++++--------------- pkg/proto/friend/friend.proto | 6 +- 6 files changed, 150 insertions(+), 150 deletions(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 5b138b7c3..0d77d9106 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -34,13 +34,13 @@ func main() { friendRouterGroup.POST("/add_friend", friend.AddFriend) //1 friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList) //1 friendRouterGroup.POST("/get_self_apply_list", friend.GetSelfApplyList) //1 - friendRouterGroup.POST("/get_friend_list", friend.GetFriendList) + friendRouterGroup.POST("/get_friend_list", friend.GetFriendList) //1 friendRouterGroup.POST("/add_blacklist", friend.AddBlacklist) friendRouterGroup.POST("/get_blacklist", friend.GetBlacklist) friendRouterGroup.POST("/remove_blacklist", friend.RemoveBlacklist) friendRouterGroup.POST("/delete_friend", friend.DeleteFriend) friendRouterGroup.POST("/add_friend_response", friend.AddFriendResponse) //1 - friendRouterGroup.POST("/set_friend_comment", friend.SetFriendComment) + friendRouterGroup.POST("/set_friend_remark", friend.SetFriendComment) friendRouterGroup.POST("/is_friend", friend.IsFriend) friendRouterGroup.POST("/import_friend", friend.ImportFriend) } diff --git a/internal/api/friend/friend.go b/internal/api/friend/friend.go index b563ac165..1ffa54413 100644 --- a/internal/api/friend/friend.go +++ b/internal/api/friend/friend.go @@ -215,14 +215,14 @@ func GetBlacklist(c *gin.Context) { c.JSON(http.StatusOK, resp) } -func SetFriendComment(c *gin.Context) { - params := api.SetFriendCommentReq{} +func SetFriendRemark(c *gin.Context) { + params := api.SetFriendRemarkReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) return } - req := &rpc.SetFriendCommentReq{CommID: &rpc.CommID{}} + req := &rpc.SetFriendRemarkReq{CommID: &rpc.CommID{}} utils.CopyStructFields(req.CommID, ¶ms.ParamsCommFriend) req.Remark = params.Remark var ok bool @@ -242,7 +242,7 @@ func SetFriendComment(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "call set friend comment rpc server failed"}) return } - resp := api.SetFriendCommentResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}} + resp := api.SetFriendRemarkResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}} log.NewInfo(req.CommID.OperationID, "SetFriendComment api return ", resp) c.JSON(http.StatusOK, resp) diff --git a/internal/rpc/friend/firend.go b/internal/rpc/friend/firend.go index e86851275..d5db10e1f 100644 --- a/internal/rpc/friend/firend.go +++ b/internal/rpc/friend/firend.go @@ -325,22 +325,22 @@ func (s *friendServer) GetBlacklist(ctx context.Context, req *pbFriend.GetBlackl return &pbFriend.GetBlacklistResp{BlackUserInfoList: userInfoList}, nil } -func (s *friendServer) SetFriendComment(ctx context.Context, req *pbFriend.SetFriendCommentReq) (*pbFriend.SetFriendCommentResp, error) { +func (s *friendServer) SetFriendRemark(ctx context.Context, req *pbFriend.SetFriendRemarkReq) (*pbFriend.SetFriendRemarkResp, error) { log.NewInfo(req.CommID.OperationID, "SetFriendComment args ", req.String()) //Parse token, to find current user information if !token_verify.CheckAccess(req.CommID.OpUserID, req.CommID.FromUserID) { log.NewError(req.CommID.OperationID, "CheckAccess false ", req.CommID.OpUserID, req.CommID.FromUserID) - return &pbFriend.SetFriendCommentResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil + return &pbFriend.SetFriendRemarkResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } err := imdb.UpdateFriendComment(req.CommID.FromUserID, req.CommID.ToUserID, req.Remark) if err != nil { log.NewError(req.CommID.OperationID, "UpdateFriendComment failed ", req.CommID.FromUserID, req.CommID.ToUserID, req.Remark) - return &pbFriend.SetFriendCommentResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + return &pbFriend.SetFriendRemarkResp{CommonResp: &pbFriend.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil } log.NewInfo(req.CommID.OperationID, "rpc SetFriendComment ok") chat.FriendInfoChangedNotification(req.CommID.OperationID, req.CommID.OpUserID, req.CommID.FromUserID, req.CommID.ToUserID) - return &pbFriend.SetFriendCommentResp{CommonResp: &pbFriend.CommonResp{}}, nil + return &pbFriend.SetFriendRemarkResp{CommonResp: &pbFriend.CommonResp{}}, nil } func (s *friendServer) RemoveBlacklist(ctx context.Context, req *pbFriend.RemoveBlacklistReq) (*pbFriend.RemoveBlacklistResp, error) { diff --git a/pkg/base_info/friend_api_struct.go b/pkg/base_info/friend_api_struct.go index e452eafda..361d54bd6 100644 --- a/pkg/base_info/friend_api_struct.go +++ b/pkg/base_info/friend_api_struct.go @@ -71,11 +71,11 @@ type BlackUserInfo struct { open_im_sdk.PublicUserInfo } -type SetFriendCommentReq struct { +type SetFriendRemarkReq struct { ParamsCommFriend Remark string `json:"remark" binding:"required"` } -type SetFriendCommentResp struct { +type SetFriendRemarkResp struct { CommResp } diff --git a/pkg/proto/friend/friend.pb.go b/pkg/proto/friend/friend.pb.go index 67efb3483..b903e4be4 100644 --- a/pkg/proto/friend/friend.pb.go +++ b/pkg/proto/friend/friend.pb.go @@ -36,7 +36,7 @@ func (m *CommonResp) Reset() { *m = CommonResp{} } func (m *CommonResp) String() string { return proto.CompactTextString(m) } func (*CommonResp) ProtoMessage() {} func (*CommonResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{0} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -84,7 +84,7 @@ func (m *CommID) Reset() { *m = CommID{} } func (m *CommID) String() string { return proto.CompactTextString(m) } func (*CommID) ProtoMessage() {} func (*CommID) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{1} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{1} } func (m *CommID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommID.Unmarshal(m, b) @@ -143,7 +143,7 @@ func (m *GetFriendsInfoReq) Reset() { *m = GetFriendsInfoReq{} } func (m *GetFriendsInfoReq) String() string { return proto.CompactTextString(m) } func (*GetFriendsInfoReq) ProtoMessage() {} func (*GetFriendsInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{2} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{2} } func (m *GetFriendsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendsInfoReq.Unmarshal(m, b) @@ -183,7 +183,7 @@ func (m *GetFriendInfoResp) Reset() { *m = GetFriendInfoResp{} } func (m *GetFriendInfoResp) String() string { return proto.CompactTextString(m) } func (*GetFriendInfoResp) ProtoMessage() {} func (*GetFriendInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{3} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{3} } func (m *GetFriendInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendInfoResp.Unmarshal(m, b) @@ -236,7 +236,7 @@ func (m *AddFriendReq) Reset() { *m = AddFriendReq{} } func (m *AddFriendReq) String() string { return proto.CompactTextString(m) } func (*AddFriendReq) ProtoMessage() {} func (*AddFriendReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{4} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{4} } func (m *AddFriendReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddFriendReq.Unmarshal(m, b) @@ -281,7 +281,7 @@ func (m *AddFriendResp) Reset() { *m = AddFriendResp{} } func (m *AddFriendResp) String() string { return proto.CompactTextString(m) } func (*AddFriendResp) ProtoMessage() {} func (*AddFriendResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{5} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{5} } func (m *AddFriendResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddFriendResp.Unmarshal(m, b) @@ -322,7 +322,7 @@ func (m *ImportFriendReq) Reset() { *m = ImportFriendReq{} } func (m *ImportFriendReq) String() string { return proto.CompactTextString(m) } func (*ImportFriendReq) ProtoMessage() {} func (*ImportFriendReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{6} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{6} } func (m *ImportFriendReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ImportFriendReq.Unmarshal(m, b) @@ -382,7 +382,7 @@ func (m *ImportFriendResp) Reset() { *m = ImportFriendResp{} } func (m *ImportFriendResp) String() string { return proto.CompactTextString(m) } func (*ImportFriendResp) ProtoMessage() {} func (*ImportFriendResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{7} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{7} } func (m *ImportFriendResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ImportFriendResp.Unmarshal(m, b) @@ -427,7 +427,7 @@ func (m *GetFriendApplyListReq) Reset() { *m = GetFriendApplyListReq{} } func (m *GetFriendApplyListReq) String() string { return proto.CompactTextString(m) } func (*GetFriendApplyListReq) ProtoMessage() {} func (*GetFriendApplyListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{8} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{8} } func (m *GetFriendApplyListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendApplyListReq.Unmarshal(m, b) @@ -467,7 +467,7 @@ func (m *GetFriendApplyListResp) Reset() { *m = GetFriendApplyListResp{} func (m *GetFriendApplyListResp) String() string { return proto.CompactTextString(m) } func (*GetFriendApplyListResp) ProtoMessage() {} func (*GetFriendApplyListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{9} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{9} } func (m *GetFriendApplyListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendApplyListResp.Unmarshal(m, b) @@ -519,7 +519,7 @@ func (m *GetFriendListReq) Reset() { *m = GetFriendListReq{} } func (m *GetFriendListReq) String() string { return proto.CompactTextString(m) } func (*GetFriendListReq) ProtoMessage() {} func (*GetFriendListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{10} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{10} } func (m *GetFriendListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendListReq.Unmarshal(m, b) @@ -559,7 +559,7 @@ func (m *GetFriendListResp) Reset() { *m = GetFriendListResp{} } func (m *GetFriendListResp) String() string { return proto.CompactTextString(m) } func (*GetFriendListResp) ProtoMessage() {} func (*GetFriendListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{11} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{11} } func (m *GetFriendListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetFriendListResp.Unmarshal(m, b) @@ -611,7 +611,7 @@ func (m *AddBlacklistReq) Reset() { *m = AddBlacklistReq{} } func (m *AddBlacklistReq) String() string { return proto.CompactTextString(m) } func (*AddBlacklistReq) ProtoMessage() {} func (*AddBlacklistReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{12} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{12} } func (m *AddBlacklistReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddBlacklistReq.Unmarshal(m, b) @@ -649,7 +649,7 @@ func (m *AddBlacklistResp) Reset() { *m = AddBlacklistResp{} } func (m *AddBlacklistResp) String() string { return proto.CompactTextString(m) } func (*AddBlacklistResp) ProtoMessage() {} func (*AddBlacklistResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{13} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{13} } func (m *AddBlacklistResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddBlacklistResp.Unmarshal(m, b) @@ -687,7 +687,7 @@ func (m *RemoveBlacklistReq) Reset() { *m = RemoveBlacklistReq{} } func (m *RemoveBlacklistReq) String() string { return proto.CompactTextString(m) } func (*RemoveBlacklistReq) ProtoMessage() {} func (*RemoveBlacklistReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{14} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{14} } func (m *RemoveBlacklistReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveBlacklistReq.Unmarshal(m, b) @@ -725,7 +725,7 @@ func (m *RemoveBlacklistResp) Reset() { *m = RemoveBlacklistResp{} } func (m *RemoveBlacklistResp) String() string { return proto.CompactTextString(m) } func (*RemoveBlacklistResp) ProtoMessage() {} func (*RemoveBlacklistResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{15} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{15} } func (m *RemoveBlacklistResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveBlacklistResp.Unmarshal(m, b) @@ -763,7 +763,7 @@ func (m *GetBlacklistReq) Reset() { *m = GetBlacklistReq{} } func (m *GetBlacklistReq) String() string { return proto.CompactTextString(m) } func (*GetBlacklistReq) ProtoMessage() {} func (*GetBlacklistReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{16} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{16} } func (m *GetBlacklistReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetBlacklistReq.Unmarshal(m, b) @@ -803,7 +803,7 @@ func (m *GetBlacklistResp) Reset() { *m = GetBlacklistResp{} } func (m *GetBlacklistResp) String() string { return proto.CompactTextString(m) } func (*GetBlacklistResp) ProtoMessage() {} func (*GetBlacklistResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{17} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{17} } func (m *GetBlacklistResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetBlacklistResp.Unmarshal(m, b) @@ -855,7 +855,7 @@ func (m *IsFriendReq) Reset() { *m = IsFriendReq{} } func (m *IsFriendReq) String() string { return proto.CompactTextString(m) } func (*IsFriendReq) ProtoMessage() {} func (*IsFriendReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{18} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{18} } func (m *IsFriendReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsFriendReq.Unmarshal(m, b) @@ -895,7 +895,7 @@ func (m *IsFriendResp) Reset() { *m = IsFriendResp{} } func (m *IsFriendResp) String() string { return proto.CompactTextString(m) } func (*IsFriendResp) ProtoMessage() {} func (*IsFriendResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{19} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{19} } func (m *IsFriendResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsFriendResp.Unmarshal(m, b) @@ -947,7 +947,7 @@ func (m *IsInBlackListReq) Reset() { *m = IsInBlackListReq{} } func (m *IsInBlackListReq) String() string { return proto.CompactTextString(m) } func (*IsInBlackListReq) ProtoMessage() {} func (*IsInBlackListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{20} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{20} } func (m *IsInBlackListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsInBlackListReq.Unmarshal(m, b) @@ -987,7 +987,7 @@ func (m *IsInBlackListResp) Reset() { *m = IsInBlackListResp{} } func (m *IsInBlackListResp) String() string { return proto.CompactTextString(m) } func (*IsInBlackListResp) ProtoMessage() {} func (*IsInBlackListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{21} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{21} } func (m *IsInBlackListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsInBlackListResp.Unmarshal(m, b) @@ -1039,7 +1039,7 @@ func (m *DeleteFriendReq) Reset() { *m = DeleteFriendReq{} } func (m *DeleteFriendReq) String() string { return proto.CompactTextString(m) } func (*DeleteFriendReq) ProtoMessage() {} func (*DeleteFriendReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{22} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{22} } func (m *DeleteFriendReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteFriendReq.Unmarshal(m, b) @@ -1077,7 +1077,7 @@ func (m *DeleteFriendResp) Reset() { *m = DeleteFriendResp{} } func (m *DeleteFriendResp) String() string { return proto.CompactTextString(m) } func (*DeleteFriendResp) ProtoMessage() {} func (*DeleteFriendResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{23} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{23} } func (m *DeleteFriendResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteFriendResp.Unmarshal(m, b) @@ -1118,7 +1118,7 @@ func (m *AddFriendResponseReq) Reset() { *m = AddFriendResponseReq{} } func (m *AddFriendResponseReq) String() string { return proto.CompactTextString(m) } func (*AddFriendResponseReq) ProtoMessage() {} func (*AddFriendResponseReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{24} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{24} } func (m *AddFriendResponseReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddFriendResponseReq.Unmarshal(m, b) @@ -1170,7 +1170,7 @@ func (m *AddFriendResponseResp) Reset() { *m = AddFriendResponseResp{} } func (m *AddFriendResponseResp) String() string { return proto.CompactTextString(m) } func (*AddFriendResponseResp) ProtoMessage() {} func (*AddFriendResponseResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{25} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{25} } func (m *AddFriendResponseResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddFriendResponseResp.Unmarshal(m, b) @@ -1197,7 +1197,7 @@ func (m *AddFriendResponseResp) GetCommonResp() *CommonResp { return nil } -type SetFriendCommentReq struct { +type SetFriendRemarkReq struct { CommID *CommID `protobuf:"bytes,1,opt,name=CommID" json:"CommID,omitempty"` Remark string `protobuf:"bytes,2,opt,name=Remark" json:"Remark,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1205,76 +1205,76 @@ type SetFriendCommentReq struct { XXX_sizecache int32 `json:"-"` } -func (m *SetFriendCommentReq) Reset() { *m = SetFriendCommentReq{} } -func (m *SetFriendCommentReq) String() string { return proto.CompactTextString(m) } -func (*SetFriendCommentReq) ProtoMessage() {} -func (*SetFriendCommentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{26} +func (m *SetFriendRemarkReq) Reset() { *m = SetFriendRemarkReq{} } +func (m *SetFriendRemarkReq) String() string { return proto.CompactTextString(m) } +func (*SetFriendRemarkReq) ProtoMessage() {} +func (*SetFriendRemarkReq) Descriptor() ([]byte, []int) { + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{26} } -func (m *SetFriendCommentReq) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SetFriendCommentReq.Unmarshal(m, b) +func (m *SetFriendRemarkReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetFriendRemarkReq.Unmarshal(m, b) } -func (m *SetFriendCommentReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SetFriendCommentReq.Marshal(b, m, deterministic) +func (m *SetFriendRemarkReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetFriendRemarkReq.Marshal(b, m, deterministic) } -func (dst *SetFriendCommentReq) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetFriendCommentReq.Merge(dst, src) +func (dst *SetFriendRemarkReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetFriendRemarkReq.Merge(dst, src) } -func (m *SetFriendCommentReq) XXX_Size() int { - return xxx_messageInfo_SetFriendCommentReq.Size(m) +func (m *SetFriendRemarkReq) XXX_Size() int { + return xxx_messageInfo_SetFriendRemarkReq.Size(m) } -func (m *SetFriendCommentReq) XXX_DiscardUnknown() { - xxx_messageInfo_SetFriendCommentReq.DiscardUnknown(m) +func (m *SetFriendRemarkReq) XXX_DiscardUnknown() { + xxx_messageInfo_SetFriendRemarkReq.DiscardUnknown(m) } -var xxx_messageInfo_SetFriendCommentReq proto.InternalMessageInfo +var xxx_messageInfo_SetFriendRemarkReq proto.InternalMessageInfo -func (m *SetFriendCommentReq) GetCommID() *CommID { +func (m *SetFriendRemarkReq) GetCommID() *CommID { if m != nil { return m.CommID } return nil } -func (m *SetFriendCommentReq) GetRemark() string { +func (m *SetFriendRemarkReq) GetRemark() string { if m != nil { return m.Remark } return "" } -type SetFriendCommentResp struct { +type SetFriendRemarkResp struct { CommonResp *CommonResp `protobuf:"bytes,1,opt,name=CommonResp" json:"CommonResp,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *SetFriendCommentResp) Reset() { *m = SetFriendCommentResp{} } -func (m *SetFriendCommentResp) String() string { return proto.CompactTextString(m) } -func (*SetFriendCommentResp) ProtoMessage() {} -func (*SetFriendCommentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{27} +func (m *SetFriendRemarkResp) Reset() { *m = SetFriendRemarkResp{} } +func (m *SetFriendRemarkResp) String() string { return proto.CompactTextString(m) } +func (*SetFriendRemarkResp) ProtoMessage() {} +func (*SetFriendRemarkResp) Descriptor() ([]byte, []int) { + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{27} } -func (m *SetFriendCommentResp) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SetFriendCommentResp.Unmarshal(m, b) +func (m *SetFriendRemarkResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetFriendRemarkResp.Unmarshal(m, b) } -func (m *SetFriendCommentResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SetFriendCommentResp.Marshal(b, m, deterministic) +func (m *SetFriendRemarkResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetFriendRemarkResp.Marshal(b, m, deterministic) } -func (dst *SetFriendCommentResp) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetFriendCommentResp.Merge(dst, src) +func (dst *SetFriendRemarkResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetFriendRemarkResp.Merge(dst, src) } -func (m *SetFriendCommentResp) XXX_Size() int { - return xxx_messageInfo_SetFriendCommentResp.Size(m) +func (m *SetFriendRemarkResp) XXX_Size() int { + return xxx_messageInfo_SetFriendRemarkResp.Size(m) } -func (m *SetFriendCommentResp) XXX_DiscardUnknown() { - xxx_messageInfo_SetFriendCommentResp.DiscardUnknown(m) +func (m *SetFriendRemarkResp) XXX_DiscardUnknown() { + xxx_messageInfo_SetFriendRemarkResp.DiscardUnknown(m) } -var xxx_messageInfo_SetFriendCommentResp proto.InternalMessageInfo +var xxx_messageInfo_SetFriendRemarkResp proto.InternalMessageInfo -func (m *SetFriendCommentResp) GetCommonResp() *CommonResp { +func (m *SetFriendRemarkResp) GetCommonResp() *CommonResp { if m != nil { return m.CommonResp } @@ -1292,7 +1292,7 @@ func (m *GetSelfApplyListReq) Reset() { *m = GetSelfApplyListReq{} } func (m *GetSelfApplyListReq) String() string { return proto.CompactTextString(m) } func (*GetSelfApplyListReq) ProtoMessage() {} func (*GetSelfApplyListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{28} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{28} } func (m *GetSelfApplyListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSelfApplyListReq.Unmarshal(m, b) @@ -1332,7 +1332,7 @@ func (m *GetSelfApplyListResp) Reset() { *m = GetSelfApplyListResp{} } func (m *GetSelfApplyListResp) String() string { return proto.CompactTextString(m) } func (*GetSelfApplyListResp) ProtoMessage() {} func (*GetSelfApplyListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_friend_a4d5a06cd0a3d99f, []int{29} + return fileDescriptor_friend_ea5e0cd91ac7f1e7, []int{29} } func (m *GetSelfApplyListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSelfApplyListResp.Unmarshal(m, b) @@ -1400,8 +1400,8 @@ func init() { proto.RegisterType((*DeleteFriendResp)(nil), "friend.DeleteFriendResp") proto.RegisterType((*AddFriendResponseReq)(nil), "friend.AddFriendResponseReq") proto.RegisterType((*AddFriendResponseResp)(nil), "friend.AddFriendResponseResp") - proto.RegisterType((*SetFriendCommentReq)(nil), "friend.SetFriendCommentReq") - proto.RegisterType((*SetFriendCommentResp)(nil), "friend.SetFriendCommentResp") + proto.RegisterType((*SetFriendRemarkReq)(nil), "friend.SetFriendRemarkReq") + proto.RegisterType((*SetFriendRemarkResp)(nil), "friend.SetFriendRemarkResp") proto.RegisterType((*GetSelfApplyListReq)(nil), "friend.GetSelfApplyListReq") proto.RegisterType((*GetSelfApplyListResp)(nil), "friend.GetSelfApplyListResp") } @@ -1429,7 +1429,7 @@ type FriendClient interface { GetBlacklist(ctx context.Context, in *GetBlacklistReq, opts ...grpc.CallOption) (*GetBlacklistResp, error) DeleteFriend(ctx context.Context, in *DeleteFriendReq, opts ...grpc.CallOption) (*DeleteFriendResp, error) AddFriendResponse(ctx context.Context, in *AddFriendResponseReq, opts ...grpc.CallOption) (*AddFriendResponseResp, error) - SetFriendComment(ctx context.Context, in *SetFriendCommentReq, opts ...grpc.CallOption) (*SetFriendCommentResp, error) + SetFriendComment(ctx context.Context, in *SetFriendRemarkReq, opts ...grpc.CallOption) (*SetFriendRemarkResp, error) ImportFriend(ctx context.Context, in *ImportFriendReq, opts ...grpc.CallOption) (*ImportFriendResp, error) } @@ -1540,8 +1540,8 @@ func (c *friendClient) AddFriendResponse(ctx context.Context, in *AddFriendRespo return out, nil } -func (c *friendClient) SetFriendComment(ctx context.Context, in *SetFriendCommentReq, opts ...grpc.CallOption) (*SetFriendCommentResp, error) { - out := new(SetFriendCommentResp) +func (c *friendClient) SetFriendComment(ctx context.Context, in *SetFriendRemarkReq, opts ...grpc.CallOption) (*SetFriendRemarkResp, error) { + out := new(SetFriendRemarkResp) err := grpc.Invoke(ctx, "/friend.friend/setFriendComment", in, out, c.cc, opts...) if err != nil { return nil, err @@ -1573,7 +1573,7 @@ type FriendServer interface { GetBlacklist(context.Context, *GetBlacklistReq) (*GetBlacklistResp, error) DeleteFriend(context.Context, *DeleteFriendReq) (*DeleteFriendResp, error) AddFriendResponse(context.Context, *AddFriendResponseReq) (*AddFriendResponseResp, error) - SetFriendComment(context.Context, *SetFriendCommentReq) (*SetFriendCommentResp, error) + SetFriendComment(context.Context, *SetFriendRemarkReq) (*SetFriendRemarkResp, error) ImportFriend(context.Context, *ImportFriendReq) (*ImportFriendResp, error) } @@ -1780,7 +1780,7 @@ func _Friend_AddFriendResponse_Handler(srv interface{}, ctx context.Context, dec } func _Friend_SetFriendComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(SetFriendCommentReq) + in := new(SetFriendRemarkReq) if err := dec(in); err != nil { return nil, err } @@ -1792,7 +1792,7 @@ func _Friend_SetFriendComment_Handler(srv interface{}, ctx context.Context, dec FullMethod: "/friend.friend/SetFriendComment", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(FriendServer).SetFriendComment(ctx, req.(*SetFriendCommentReq)) + return srv.(FriendServer).SetFriendComment(ctx, req.(*SetFriendRemarkReq)) } return interceptor(ctx, in, info, handler) } @@ -1876,66 +1876,66 @@ var _Friend_serviceDesc = grpc.ServiceDesc{ Metadata: "friend/friend.proto", } -func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_a4d5a06cd0a3d99f) } - -var fileDescriptor_friend_a4d5a06cd0a3d99f = []byte{ - // 919 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcb, 0x4f, 0xf3, 0x46, - 0x10, 0x97, 0x09, 0x84, 0x64, 0x12, 0x48, 0xb2, 0x09, 0x90, 0x9a, 0x87, 0x52, 0x1f, 0xaa, 0xa8, - 0x87, 0x44, 0x4a, 0x45, 0x55, 0x4a, 0x5b, 0x14, 0x08, 0xa1, 0xa6, 0xa5, 0x20, 0x53, 0x2e, 0x55, - 0x25, 0x64, 0xf0, 0x26, 0xb5, 0xe2, 0xd8, 0x8b, 0xd7, 0x14, 0xf5, 0xd2, 0x43, 0x0f, 0xbd, 0x56, - 0xaa, 0x7a, 0xeb, 0xad, 0x7f, 0x69, 0x65, 0xaf, 0x1d, 0xaf, 0x1f, 0x41, 0x9f, 0xcd, 0x27, 0x7d, - 0x27, 0x98, 0x99, 0x9d, 0xf1, 0x6f, 0x1e, 0xfb, 0x9b, 0x0d, 0x34, 0x27, 0xb6, 0x8e, 0x4d, 0xad, - 0xcf, 0xfe, 0xf4, 0x88, 0x6d, 0x39, 0x16, 0x2a, 0x32, 0x49, 0xfc, 0xf8, 0x9a, 0x60, 0xf3, 0x5e, - 0xbe, 0xea, 0x93, 0xd9, 0xb4, 0xef, 0x99, 0xfa, 0x54, 0x9b, 0xdd, 0xbf, 0xd0, 0xfe, 0x0b, 0x65, - 0x47, 0xa5, 0x6f, 0x00, 0xce, 0xac, 0xf9, 0xdc, 0x32, 0x15, 0x4c, 0x09, 0x6a, 0xc3, 0x3a, 0xb6, - 0xed, 0x33, 0x4b, 0xc3, 0x6d, 0xa1, 0x23, 0x74, 0xd7, 0x94, 0x40, 0x44, 0xdb, 0x50, 0xc4, 0xb6, - 0x7d, 0x45, 0xa7, 0xed, 0x95, 0x8e, 0xd0, 0x2d, 0x2b, 0xbe, 0x24, 0xfd, 0x21, 0x40, 0xd1, 0x0d, - 0x20, 0x8f, 0x90, 0x08, 0xa5, 0x6b, 0x72, 0x47, 0xb1, 0x2d, 0x8f, 0x3c, 0xef, 0xb2, 0xb2, 0x90, - 0x51, 0x07, 0x2a, 0xd7, 0x04, 0xdb, 0xaa, 0xa3, 0x5b, 0xa6, 0x3c, 0xf2, 0x63, 0xf0, 0x2a, 0xd7, - 0xfb, 0x47, 0xcb, 0xf7, 0x5e, 0x65, 0xde, 0x81, 0x8c, 0x0e, 0x00, 0xc6, 0xb6, 0x35, 0xf7, 0xad, - 0x6b, 0x9e, 0x95, 0xd3, 0x48, 0xc7, 0xd0, 0xb8, 0xc0, 0xce, 0xd8, 0x4b, 0x9a, 0xca, 0xe6, 0xc4, - 0x52, 0xf0, 0x13, 0xfa, 0x24, 0x00, 0xe6, 0x81, 0xa9, 0x0c, 0x36, 0x7b, 0x7e, 0x8d, 0x98, 0x56, - 0xf1, 0xad, 0xd2, 0x9f, 0x02, 0xe7, 0xcd, 0x9c, 0x59, 0x25, 0xce, 0xa3, 0x95, 0x38, 0x0f, 0x2b, - 0x71, 0x1e, 0xa9, 0x04, 0x93, 0xd0, 0x09, 0x6c, 0x86, 0x31, 0xbe, 0xd7, 0xa9, 0xd3, 0x2e, 0x74, - 0x0a, 0xdd, 0xca, 0x60, 0xa7, 0x67, 0xb9, 0x5d, 0xd0, 0xe7, 0xf7, 0x54, 0x9b, 0xf5, 0xb8, 0xcf, - 0xc4, 0x8e, 0x4b, 0x3f, 0x40, 0x75, 0xa8, 0x69, 0x4c, 0x99, 0x21, 0x01, 0x17, 0x90, 0x82, 0x9f, - 0x38, 0x40, 0x4c, 0x92, 0xce, 0x60, 0x83, 0x8b, 0x47, 0x09, 0x1a, 0xf0, 0xbd, 0xf6, 0x83, 0x22, - 0x3e, 0x28, 0xb3, 0x28, 0xdc, 0x29, 0xe9, 0x5f, 0x01, 0x6a, 0xf2, 0x9c, 0x58, 0xb6, 0x13, 0x02, - 0xfb, 0x14, 0xea, 0x4c, 0x60, 0xe5, 0xf7, 0x72, 0x15, 0x3a, 0x85, 0x6e, 0x59, 0x49, 0xe8, 0xdf, - 0xa1, 0xf1, 0xd1, 0xe6, 0x16, 0xe2, 0xcd, 0x8d, 0x8c, 0xd5, 0x6a, 0x74, 0xac, 0xa4, 0xdf, 0xa1, - 0x1e, 0x05, 0x97, 0x2f, 0x4b, 0xf4, 0x39, 0x6c, 0x8f, 0x55, 0xdd, 0xc0, 0x5a, 0x22, 0xaf, 0x15, - 0x2f, 0xaf, 0x25, 0x56, 0xe9, 0x04, 0xb6, 0x16, 0xa3, 0x33, 0x24, 0xc4, 0xf8, 0xcd, 0xd5, 0x66, - 0x19, 0xbe, 0x7f, 0x04, 0xd8, 0x4e, 0x8b, 0x90, 0x6b, 0x02, 0xbf, 0x85, 0xc6, 0xa2, 0x49, 0xcf, - 0x98, 0x3a, 0xdc, 0x10, 0x8a, 0x29, 0x43, 0xe8, 0x9f, 0x52, 0x92, 0x4e, 0xd2, 0x97, 0x50, 0x5f, - 0xa0, 0xca, 0x9a, 0x52, 0xe4, 0x3e, 0xbd, 0x21, 0x9b, 0x37, 0xdf, 0xa7, 0x23, 0xa8, 0x0d, 0x35, - 0xed, 0xd4, 0x50, 0x1f, 0x67, 0x46, 0xc6, 0x1c, 0xc6, 0x50, 0x8f, 0xba, 0xe6, 0xbc, 0x3d, 0x5f, - 0x01, 0x52, 0xf0, 0xdc, 0xfa, 0x15, 0xe7, 0x42, 0x21, 0x43, 0x33, 0xe1, 0x9d, 0x13, 0xc8, 0x11, - 0xd4, 0x2e, 0xb0, 0x93, 0x0b, 0xc5, 0x5f, 0x82, 0x37, 0x0c, 0x51, 0x0c, 0xd9, 0xdb, 0x29, 0x43, - 0xc3, 0x0b, 0xe1, 0xdd, 0x9e, 0x68, 0x47, 0x77, 0x23, 0x1d, 0xbd, 0x79, 0x7e, 0x30, 0xf4, 0xc7, - 0xe0, 0x98, 0x92, 0xf4, 0x92, 0x0e, 0xa1, 0x22, 0xd3, 0xcc, 0x3c, 0x29, 0xfd, 0x0c, 0xd5, 0xd0, - 0x2d, 0x57, 0x0e, 0x22, 0x94, 0x5c, 0x4f, 0xcb, 0xa4, 0xd8, 0x23, 0xaa, 0x92, 0xb2, 0x90, 0xdd, - 0x2b, 0x23, 0x53, 0xd9, 0xf4, 0xd0, 0x66, 0xbd, 0x32, 0x2a, 0x34, 0x62, 0xbe, 0xef, 0x1d, 0xde, - 0x11, 0xd4, 0x46, 0xd8, 0xc0, 0x0e, 0xce, 0x5e, 0xb7, 0x31, 0xd4, 0xa3, 0xae, 0x39, 0x67, 0x90, - 0x40, 0x2b, 0xb2, 0x8f, 0x5c, 0x5c, 0x59, 0xf6, 0x1c, 0x82, 0xd5, 0x89, 0xa1, 0xb2, 0xa4, 0xd7, - 0x14, 0xef, 0x7f, 0xb4, 0x07, 0xe5, 0x5f, 0x54, 0x53, 0x33, 0xb0, 0x5b, 0x0d, 0xb6, 0x3b, 0x42, - 0x85, 0xf4, 0x1d, 0x6c, 0xa5, 0x7c, 0x31, 0x27, 0xfc, 0x3b, 0x68, 0xde, 0x06, 0xb4, 0xe6, 0xaa, - 0xb1, 0xe9, 0x64, 0xde, 0xd2, 0x73, 0xd5, 0x9e, 0x85, 0x5b, 0xda, 0x95, 0xa4, 0x4b, 0x68, 0x25, - 0xc3, 0xe6, 0x84, 0xf8, 0x35, 0x34, 0x2f, 0xb0, 0x73, 0x8b, 0x8d, 0x49, 0xae, 0x65, 0xf4, 0xb7, - 0x00, 0xad, 0xa4, 0xff, 0x87, 0x5d, 0x45, 0x83, 0xff, 0xd6, 0xc1, 0x7f, 0xce, 0xa2, 0x2f, 0xa0, - 0xac, 0x06, 0xed, 0x44, 0xad, 0x20, 0x09, 0xfe, 0xcd, 0x24, 0x6e, 0xa5, 0x68, 0x29, 0x41, 0xb7, - 0x80, 0xa6, 0x89, 0x2d, 0x8b, 0xf6, 0x83, 0xc3, 0xa9, 0x3b, 0x5c, 0x3c, 0x78, 0xcd, 0x4c, 0x09, - 0xba, 0x82, 0xfa, 0x34, 0x56, 0x2d, 0xb4, 0xcb, 0xf9, 0xc4, 0xfb, 0x20, 0xee, 0x2d, 0x37, 0x52, - 0x82, 0x46, 0xb0, 0x31, 0xe5, 0xd7, 0x26, 0x6a, 0x27, 0xbe, 0x1f, 0x04, 0xfa, 0x68, 0x89, 0x85, - 0x12, 0x34, 0x84, 0xaa, 0xca, 0x6d, 0x2e, 0xb4, 0xc3, 0x15, 0x84, 0xa7, 0x7f, 0xb1, 0x9d, 0x6e, - 0xa0, 0x04, 0x5d, 0x42, 0xcd, 0x8e, 0xae, 0x1d, 0x24, 0x06, 0x87, 0x93, 0xdb, 0x4c, 0xdc, 0x5d, - 0x6a, 0xa3, 0x04, 0x1d, 0x42, 0x49, 0xf7, 0x39, 0x17, 0x35, 0x83, 0x83, 0x1c, 0x79, 0x8b, 0xad, - 0xa4, 0x92, 0xd5, 0x42, 0xe7, 0x09, 0x31, 0xac, 0x45, 0x9c, 0x63, 0xc3, 0x5a, 0x24, 0x19, 0x74, - 0x08, 0xd5, 0x29, 0xb7, 0xb8, 0xc2, 0x5a, 0xc4, 0x56, 0xa1, 0xd8, 0x4e, 0x37, 0xb0, 0x10, 0x1a, - 0xc7, 0x7d, 0x61, 0x88, 0x18, 0x99, 0x86, 0x21, 0x12, 0x54, 0x79, 0x03, 0x0d, 0x35, 0x4e, 0x42, - 0x68, 0x2f, 0x75, 0x4e, 0x7d, 0x46, 0x14, 0xf7, 0x5f, 0xb1, 0xb2, 0xc1, 0xa3, 0x31, 0xca, 0x08, - 0x07, 0x2f, 0x85, 0xa3, 0xc2, 0xc1, 0x4b, 0x65, 0x9a, 0x21, 0x54, 0x75, 0xee, 0x11, 0x1d, 0xe6, - 0x18, 0x7b, 0xf7, 0x87, 0x39, 0xc6, 0xdf, 0xdc, 0xa7, 0x8d, 0x9f, 0x6a, 0x3d, 0xff, 0x27, 0xe8, - 0x31, 0xfb, 0xf3, 0x50, 0xf4, 0x7e, 0x5f, 0x7e, 0xf6, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, - 0xd1, 0x9d, 0x13, 0xa1, 0x0e, 0x00, 0x00, +func init() { proto.RegisterFile("friend/friend.proto", fileDescriptor_friend_ea5e0cd91ac7f1e7) } + +var fileDescriptor_friend_ea5e0cd91ac7f1e7 = []byte{ + // 924 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcd, 0x6f, 0xe3, 0x44, + 0x14, 0x97, 0x37, 0x6d, 0x36, 0x79, 0xc9, 0x6e, 0x92, 0x97, 0xb4, 0x1b, 0xdc, 0xee, 0x2a, 0xf8, + 0x80, 0x22, 0x0e, 0x89, 0x14, 0xb4, 0x88, 0xb2, 0xc0, 0x2a, 0xdb, 0x34, 0xc5, 0x2c, 0xa5, 0x2b, + 0x77, 0xb9, 0x20, 0xa4, 0xca, 0x5b, 0x4f, 0x82, 0x15, 0xc7, 0x9e, 0x7a, 0x5c, 0x2a, 0x2e, 0x1c, + 0x38, 0x70, 0x45, 0x42, 0xdc, 0xb8, 0xf0, 0xa7, 0x22, 0x7b, 0xec, 0x78, 0xfc, 0x91, 0x0a, 0xbb, + 0x48, 0x7b, 0x6a, 0xdf, 0x7b, 0xf3, 0x7b, 0x7e, 0x5f, 0xf3, 0x7e, 0x13, 0xe8, 0x2e, 0x5c, 0x93, + 0xd8, 0xc6, 0x98, 0xff, 0x19, 0x51, 0xd7, 0xf1, 0x1c, 0xac, 0x72, 0x49, 0xfe, 0xf0, 0x9c, 0x12, + 0xfb, 0x52, 0x3d, 0x1b, 0xd3, 0xd5, 0x72, 0x1c, 0x98, 0xc6, 0xcc, 0x58, 0x5d, 0xde, 0xb2, 0xf1, + 0x2d, 0xe3, 0x47, 0x95, 0xaf, 0x00, 0x8e, 0x9d, 0xf5, 0xda, 0xb1, 0x35, 0xc2, 0x28, 0xf6, 0xe1, + 0x21, 0x71, 0xdd, 0x63, 0xc7, 0x20, 0x7d, 0x69, 0x20, 0x0d, 0x77, 0xb5, 0x48, 0xc4, 0x7d, 0xa8, + 0x12, 0xd7, 0x3d, 0x63, 0xcb, 0xfe, 0x83, 0x81, 0x34, 0xac, 0x6b, 0xa1, 0xa4, 0xfc, 0x26, 0x41, + 0xd5, 0x77, 0xa0, 0xce, 0x50, 0x86, 0xda, 0x39, 0xfd, 0x9e, 0x11, 0x57, 0x9d, 0x05, 0xe8, 0xba, + 0xb6, 0x91, 0x71, 0x00, 0x8d, 0x73, 0x4a, 0x5c, 0xdd, 0x33, 0x1d, 0x5b, 0x9d, 0x85, 0x3e, 0x44, + 0x95, 0x8f, 0x7e, 0xeb, 0x84, 0xe8, 0x1d, 0x8e, 0x8e, 0x64, 0x7c, 0x06, 0x30, 0x77, 0x9d, 0x75, + 0x68, 0xdd, 0x0d, 0xac, 0x82, 0x46, 0x79, 0x01, 0x9d, 0x53, 0xe2, 0xcd, 0x83, 0xa4, 0x99, 0x6a, + 0x2f, 0x1c, 0x8d, 0x5c, 0xe3, 0x47, 0x51, 0x60, 0x41, 0x30, 0x8d, 0xc9, 0xe3, 0x51, 0x58, 0x23, + 0xae, 0xd5, 0x42, 0xab, 0xf2, 0xbb, 0x24, 0xa0, 0x39, 0x98, 0x57, 0xe2, 0x24, 0x59, 0x89, 0x93, + 0xb8, 0x12, 0x27, 0x89, 0x4a, 0x70, 0x09, 0x5f, 0xc2, 0xe3, 0xd8, 0xc7, 0xb7, 0x26, 0xf3, 0xfa, + 0x95, 0x41, 0x65, 0xd8, 0x98, 0x3c, 0x19, 0x39, 0x7e, 0x17, 0xcc, 0xf5, 0x25, 0x33, 0x56, 0x23, + 0xe1, 0x33, 0xa9, 0xe3, 0xca, 0x77, 0xd0, 0x9c, 0x1a, 0x06, 0x57, 0x16, 0x48, 0xc0, 0x0f, 0x48, + 0x23, 0xd7, 0x42, 0x40, 0x5c, 0x52, 0x8e, 0xe1, 0x91, 0xe0, 0x8f, 0x51, 0x9c, 0x88, 0xbd, 0x0e, + 0x9d, 0xa2, 0xe8, 0x94, 0x5b, 0x34, 0xe1, 0x94, 0xf2, 0xb7, 0x04, 0x2d, 0x75, 0x4d, 0x1d, 0xd7, + 0x8b, 0x03, 0xfb, 0x18, 0xda, 0x5c, 0xe0, 0xe5, 0x0f, 0x72, 0x95, 0x06, 0x95, 0x61, 0x5d, 0xcb, + 0xe8, 0xff, 0x43, 0xe3, 0x93, 0xcd, 0xad, 0xa4, 0x9b, 0x9b, 0x18, 0xab, 0x9d, 0xe4, 0x58, 0x29, + 0xbf, 0x42, 0x3b, 0x19, 0x5c, 0xb9, 0x2c, 0xf1, 0x53, 0xd8, 0x9f, 0xeb, 0xa6, 0x45, 0x8c, 0x4c, + 0x5e, 0x0f, 0x82, 0xbc, 0xb6, 0x58, 0x95, 0x97, 0xb0, 0xb7, 0x19, 0x9d, 0x29, 0xa5, 0xd6, 0x2f, + 0xbe, 0xb6, 0xc8, 0xf0, 0xfd, 0x25, 0xc1, 0x7e, 0x9e, 0x87, 0x52, 0x13, 0xf8, 0x35, 0x74, 0x36, + 0x4d, 0xba, 0x21, 0xcc, 0x13, 0x86, 0x50, 0xce, 0x19, 0xc2, 0xf0, 0x94, 0x96, 0x05, 0x29, 0x9f, + 0x43, 0x7b, 0x13, 0x55, 0xd1, 0x94, 0x12, 0xf7, 0xe9, 0x1e, 0xd9, 0xdc, 0xfb, 0x3e, 0x1d, 0x41, + 0x6b, 0x6a, 0x18, 0xaf, 0x2c, 0xfd, 0x6a, 0x65, 0x15, 0xcc, 0x61, 0x0e, 0xed, 0x24, 0xb4, 0xe4, + 0xed, 0xf9, 0x02, 0x50, 0x23, 0x6b, 0xe7, 0x67, 0x52, 0x2a, 0x0a, 0x15, 0xba, 0x19, 0x74, 0xc9, + 0x40, 0x8e, 0xa0, 0x75, 0x4a, 0xbc, 0x52, 0x51, 0xfc, 0x21, 0x05, 0xc3, 0x90, 0x8c, 0xa1, 0x78, + 0x3b, 0x55, 0xe8, 0x04, 0x2e, 0x82, 0xdb, 0x93, 0xec, 0xe8, 0x41, 0xa2, 0xa3, 0x6f, 0x6e, 0xde, + 0x59, 0xe6, 0x55, 0x74, 0x4c, 0xcb, 0xa2, 0x94, 0xe7, 0xd0, 0x50, 0x59, 0xe1, 0x3d, 0xa9, 0xfc, + 0x08, 0xcd, 0x18, 0x56, 0x2a, 0x07, 0x19, 0x6a, 0x3e, 0xd2, 0xb1, 0x19, 0x09, 0x16, 0x55, 0x4d, + 0xdb, 0xc8, 0xfe, 0x95, 0x51, 0x99, 0x6a, 0x07, 0xd1, 0x16, 0xbd, 0x32, 0x3a, 0x74, 0x52, 0xd8, + 0xff, 0x3d, 0xbc, 0x23, 0x68, 0xcd, 0x88, 0x45, 0x3c, 0x52, 0xbc, 0x6e, 0x73, 0x68, 0x27, 0xa1, + 0x25, 0x67, 0x90, 0x42, 0x2f, 0xc1, 0x47, 0x7e, 0x5c, 0x45, 0x78, 0x0e, 0x61, 0x67, 0x61, 0xe9, + 0x3c, 0xe9, 0x5d, 0x2d, 0xf8, 0x1f, 0x0f, 0xa1, 0xfe, 0x93, 0x6e, 0x1b, 0x16, 0xf1, 0xab, 0xc1, + 0xb9, 0x23, 0x56, 0x28, 0xaf, 0x61, 0x2f, 0xe7, 0x8b, 0x25, 0xc3, 0x7f, 0x0b, 0x78, 0x41, 0x36, + 0x44, 0xb3, 0xd6, 0xdd, 0x55, 0x61, 0x92, 0xf6, 0x41, 0x31, 0x49, 0xfb, 0x92, 0x7f, 0xc7, 0x33, + 0x5e, 0x4b, 0x06, 0xf8, 0x25, 0x74, 0x4f, 0x89, 0x77, 0x41, 0xac, 0x45, 0x29, 0x2a, 0xfa, 0x53, + 0x82, 0x5e, 0x16, 0xff, 0x7e, 0x89, 0x68, 0xf2, 0xcf, 0x43, 0x08, 0x1f, 0xb3, 0xf8, 0x19, 0xd4, + 0xf5, 0xa8, 0x99, 0xd8, 0x8b, 0x92, 0x10, 0x5f, 0x4c, 0xf2, 0x5e, 0x8e, 0x96, 0x51, 0xbc, 0x00, + 0x5c, 0x66, 0x38, 0x16, 0x9f, 0x46, 0x87, 0x73, 0x19, 0x5c, 0x7e, 0x76, 0x97, 0x99, 0x51, 0x3c, + 0x83, 0xf6, 0x32, 0x55, 0x2d, 0x3c, 0x10, 0x30, 0xe9, 0x3e, 0xc8, 0x87, 0xdb, 0x8d, 0x8c, 0xe2, + 0x0c, 0x1e, 0x2d, 0x45, 0xd2, 0xc4, 0x7e, 0xe6, 0xfb, 0x91, 0xa3, 0x0f, 0xb6, 0x58, 0x18, 0xc5, + 0x29, 0x34, 0x75, 0x81, 0xb7, 0xf0, 0x89, 0x50, 0x10, 0x71, 0xf9, 0xcb, 0xfd, 0x7c, 0x03, 0xa3, + 0xf8, 0x0d, 0xb4, 0xdc, 0x24, 0xe9, 0xa0, 0x1c, 0x1d, 0xce, 0x72, 0x99, 0x7c, 0xb0, 0xd5, 0xc6, + 0x28, 0x3e, 0x87, 0x9a, 0x19, 0x6e, 0x5c, 0xec, 0x46, 0x07, 0x85, 0xd5, 0x2d, 0xf7, 0xb2, 0x4a, + 0x5e, 0x0b, 0x53, 0x5c, 0x87, 0x71, 0x2d, 0xd2, 0x1b, 0x36, 0xae, 0x45, 0x76, 0x7f, 0x4e, 0xa1, + 0xb9, 0x14, 0x68, 0x2b, 0xae, 0x45, 0x8a, 0x08, 0xe5, 0x7e, 0xbe, 0x81, 0xbb, 0x30, 0x84, 0xcd, + 0x17, 0xbb, 0x48, 0xad, 0xd2, 0xd8, 0x45, 0x66, 0x51, 0xbe, 0x81, 0x8e, 0x9e, 0x5e, 0x41, 0x78, + 0x98, 0x3b, 0xa7, 0xe1, 0x3e, 0x94, 0x9f, 0xde, 0x61, 0x65, 0x14, 0x5f, 0x43, 0x9b, 0x45, 0x8d, + 0xf7, 0xaf, 0x2e, 0xb1, 0x85, 0x0e, 0x65, 0x37, 0x54, 0xdc, 0xa1, 0xbc, 0x3d, 0x33, 0x85, 0xa6, + 0x29, 0x3c, 0xa0, 0xe3, 0x0c, 0x53, 0x6f, 0xfe, 0x38, 0xc3, 0xf4, 0x7b, 0xfb, 0x55, 0xe7, 0x87, + 0xd6, 0x28, 0xfc, 0xf9, 0xf9, 0x82, 0xff, 0x79, 0x57, 0x0d, 0x7e, 0x5b, 0x7e, 0xf2, 0x6f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x8d, 0xf7, 0x25, 0x0f, 0x9d, 0x0e, 0x00, 0x00, } diff --git a/pkg/proto/friend/friend.proto b/pkg/proto/friend/friend.proto index 052eb1d9d..df22713b8 100644 --- a/pkg/proto/friend/friend.proto +++ b/pkg/proto/friend/friend.proto @@ -130,11 +130,11 @@ message AddFriendResponseResp{ CommonResp CommonResp = 1; } -message SetFriendCommentReq{ +message SetFriendRemarkReq{ CommID CommID = 1; string Remark = 2; } -message SetFriendCommentResp{ +message SetFriendRemarkResp{ CommonResp CommonResp = 1; } @@ -160,6 +160,6 @@ service friend{ rpc getBlacklist(GetBlacklistReq) returns(GetBlacklistResp); rpc deleteFriend(DeleteFriendReq) returns(DeleteFriendResp); rpc addFriendResponse(AddFriendResponseReq) returns(AddFriendResponseResp); - rpc setFriendComment(SetFriendCommentReq) returns(SetFriendCommentResp); + rpc setFriendComment(SetFriendRemarkReq) returns(SetFriendRemarkResp); rpc importFriend(ImportFriendReq) returns(ImportFriendResp); } \ No newline at end of file