Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

pkg/errs/code.go

@@ -84,6 +84,6 @@ const (
 	ConnUpdateErr       = 1603
 
 	// S3错误码
-	FileUploadedCompleteError = 2001 // 文件已上传
-	FileUploadedExpiredError  = 2002 // 上传过期
+	FileUploadedCompleteError = 1701 // 文件已上传
+	FileUploadedExpiredError  = 1702 // 上传过期
 )

pkg/proto/sdkws/sdkws.proto

@@ -178,10 +178,11 @@ message MsgData {
   map<string, bool> options = 18;
   OfflinePushInfo offlinePushInfo = 19;
   repeated string atUserIDList = 20;
-  bytes msgDataList = 21;
-  string attachedInfo = 22;
-  string  ex = 23;
-
+  string attachedInfo = 21;
+  string  ex = 22;
+}
+message PushMessages{
+  repeated MsgData msgs = 1;
 }
 message OfflinePushInfo{
   string title = 1;