Merge remote-tracking branch 'origin/errcode' into errcode

pkg/proto/msg/msg.proto

@@ -223,6 +223,13 @@ message MsgDataToModifyByMQ{
  string triggerID = 3;
 }
 
+message DelMsgListReq{
+  string userID = 2;
+  repeated uint32 seqList = 3;
+}
+
+message DelMsgListResp{
+}
 
 service msg {
   //获取最小最大seq（包括用户的，以及指定群组的）
@@ -232,7 +239,7 @@ service msg {
   //发送消息
   rpc SendMsg(SendMsgReq) returns(SendMsgResp);
   //删除某人消息
-  rpc DelMsgList(sdkws.DelMsgListReq) returns(sdkws.DelMsgListResp);
+  rpc DelMsgList(DelMsgListReq) returns(DelMsgListResp);
   //删除某个用户某个大群消息
   rpc DelSuperGroupMsg(DelSuperGroupMsgReq) returns(DelSuperGroupMsgResp);
   //清空某人所有消息

pkg/proto/sdkws/ws.proto

@@ -132,12 +132,12 @@ message FriendRequest{
 ///////////////////////////////////base end/////////////////////////////////////
 message PullMessageBySeqListReq{
   string userID = 1;
-  repeated uint32 seqList = 3;
+  repeated int64 seqs = 3;
   map <string, seqList>groupSeqList = 4;
 }
 
 message seqList {
-  repeated uint32 seqList = 1;
+  repeated int64 seqs = 1;
 }
 
 
@@ -159,12 +159,12 @@ message GetMaxAndMinSeqReq {
   string userID = 2;
 }
 message MaxAndMinSeq{
-  uint32 maxSeq = 1;
-  uint32 minSeq = 2;
+  int64 maxSeq = 1;
+  int64 minSeq = 2;
 }
 message GetMaxAndMinSeqResp {
-  uint32 maxSeq = 1;
-  uint32 minSeq = 2;
+  int64 maxSeq = 1;
+  int64 minSeq = 2;
   map<string, MaxAndMinSeq> groupMaxAndMinSeq = 5;
 }
 
@@ -187,7 +187,7 @@ message MsgData {
   int32 msgFrom = 10;
   int32 contentType = 11;
   bytes content = 12;
-  uint32 seq = 14;
+  int64 seq = 14;
   int64 sendTime = 15;
   int64 createTime = 16;
   int32 status = 17;
@@ -426,7 +426,7 @@ message ConversationSetPrivateTips{
 message DeleteMessageTips{
   string opUserID = 1;
   string userID = 2;
-  repeated uint32 seqList = 3;
+  repeated int64 seqs = 3;
 }
 ///cms
 message RequestPagination {
@@ -601,13 +601,7 @@ message SignalGetTokenByRoomIDReply {
 }
 
 
-message DelMsgListReq{
-  string userID = 2;
-  repeated uint32 seqList = 3;
-}
 
-message DelMsgListResp{
-}
 
 message SetAppBackgroundStatusReq {
   string userID = 1;
@@ -642,9 +636,3 @@ message KeyValue {
   int64 latestUpdateTime = 3;
 }
 
-
-message ResponsePagination {
-  int32 CurrentPage = 5;
-  int32 ShowNumber = 6;
-}
-