tidy code

pkg/proto/friend/friend.proto

@@ -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);
 }