super group

pkg/proto/auto_proto.sh

@@ -4,10 +4,14 @@ source ./proto_dir.cfg
 
 for ((i = 0; i < ${#all_proto[*]}; i++)); do
   proto=${all_proto[$i]}
-  protoc -I ../../../ -I ./ --go_out=plugins=grpc:. $proto
+
+  protoc -I ../../../  -I ./ --go_out=plugins=grpc:. $proto
   s=`echo $proto | sed 's/ //g'`
   v=${s//proto/pb.go}
   protoc-go-inject-tag -input=./$v
   echo "protoc --go_out=plugins=grpc:." $proto
 done
 echo "proto file generate success..."
+
+find ./ -type f -path "*.pb.go"|xargs sed -i 's/\".\/sdk_ws\"/\"Open_IM\/pkg\/proto\/sdk_ws\"/g'
+

pkg/proto/sdk_ws/ws.proto

@@ -170,30 +170,51 @@ message  UserInDepartment {
 
 
 ///////////////////////////////////base end/////////////////////////////////////
+message PullMessageBySeqListReq{
+  string userID = 1;
+  string operationID = 2;
+  repeated uint32 seqList = 3;
+  map <string, seqList>groupSeqList = 4;
+}
+
+message seqList {
+    repeated uint32 seqList = 1;
+}
+
+
+message MsgDataList {
+    repeated MsgData msgDataList = 1;
+}
 
 message PullMessageBySeqListResp {
   int32 errCode = 1;
   string errMsg = 2;
   repeated MsgData list = 3;
+  map<string, MsgDataList> groupMsgDataList = 4;
 }
-message PullMessageBySeqListReq{
-  string userID = 1;
-  string operationID = 2;
-  repeated uint32 seqList = 3;
-}
+
+
+
 message GetMaxAndMinSeqReq {
+    repeated string groupIDList = 1;
+    string userID = 2;
+}
+message MaxAndMinSeq{
+  uint32 maxSeq = 1;
+  uint32 minSeq = 2;
 }
 message GetMaxAndMinSeqResp {
   uint32 maxSeq = 1;
   uint32 minSeq = 2;
+  map<string, MaxAndMinSeq> groupMaxAndMinSeq = 3;
 }
 
 message UserSendMsgResp {
   string serverMsgID = 1;
   string clientMsgID = 2;
   int64  sendTime = 3;
-
 }
+
 message MsgData {
   string  sendID = 1;
   string  recvID = 2;