blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangchuxiao 2022-03-14 15:18:47 +08:00
commit d90b31c5df
4 changed files with 1397 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/msg_gateway/gate/validate.go
View File

@ -58,7 +58,19 @@ type SeqListData struct {
func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, errMsg string, returnData interface{}) { func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, errMsg string, returnData interface{}) {
switch r { 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{} data := open_im_sdk.MsgData{}
if err := proto.Unmarshal(m.Data, &data); err != nil { if err := proto.Unmarshal(m.Data, &data); err != nil {
log.ErrorByKv("Decode Data struct err", "", "err", err.Error(), "reqIdentifier", r) log.ErrorByKv("Decode Data struct err", "", "err", err.Error(), "reqIdentifier", r)

6
pkg/common/constant/constant.go
View File

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

1540
pkg/proto/sdk_ws/ws.pb.go
View File

File diff suppressed because it is too large Load Diff

10
pkg/proto/sdk_ws/ws.proto
View File

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