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

internal/msg_gateway/gate/validate.go

@@ -58,7 +58,19 @@ type SeqListData struct {
 
 func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, errMsg string, returnData interface{}) {
 	switch r {
-	case constant.WSSendMsg | constant.WSSendSignalMsg:
+	case constant.WSSendMsg:
+		data := open_im_sdk.MsgData{}
+		if err := proto.Unmarshal(m.Data, &data); err != nil {
+			log.ErrorByKv("Decode Data struct  err", "", "err", err.Error(), "reqIdentifier", r)
+			return false, 203, err.Error(), nil
+		}
+		if err := validate.Struct(data); err != nil {
+			log.ErrorByKv("data args validate  err", "", "err", err.Error(), "reqIdentifier", r)
+			return false, 204, err.Error(), nil
+
+		}
+		return true, 0, "", data
+	case constant.WSSendSignalMsg:
 		data := open_im_sdk.MsgData{}
 		if err := proto.Unmarshal(m.Data, &data); err != nil {
 			log.ErrorByKv("Decode Data struct  err", "", "err", err.Error(), "reqIdentifier", r)

pkg/common/constant/constant.go

@@ -77,7 +77,11 @@ const (
 	MemberKickedNotification             = 1508
 	MemberInvitedNotification            = 1509
 	MemberEnterNotification              = 1510
-	NotificationEnd                      = 2000
+
+	SignalingNotificationBegin = 1600
+	SignalingNotification      = 1601
+	SignalingNotificationEnd   = 1699
+	NotificationEnd            = 2000
 
 	//MsgFrom
 	UserMsgType = 100

pkg/proto/sdk_ws/ws.proto

@@ -371,21 +371,29 @@ message InvitationInfo  {
     repeated string inviteeUserIDList = 2;
     string customData = 3;
     string  groupID = 4;
+    string roomID = 5;
+    int32 timeout = 6;
+    string mediaType = 7;
+     int32 PlatformID = 8;
+    int32   sessionType = 9;
+
+
 }
 
 
 message SignalInviteReq {
     InvitationInfo invitation = 1;
+    OfflinePushInfo offlinePushInfo  = 2;
 }
 
 message SignalInviteReply {
   string token = 1;
-  string roomID = 2;
   string liveURL = 3;
 }
 
 message SignalInviteInGroupReq {
   InvitationInfo invitation = 1;
+  OfflinePushInfo offlinePushInfo  = 2;
 }
 
 message SignalInviteInGroupReply {