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

meta data add

Browse Source
This commit is contained in:
Gordon 2022-03-16 15:21:18 +08:00
parent fa21ae6161
commit b7ff0cf2a2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/msg_gateway/gate/open_im_media/room.go
View File

@ -2,6 +2,7 @@ package open_im_media
import ( import (
pbRtc "Open_IM/pkg/proto/rtc" pbRtc "Open_IM/pkg/proto/rtc"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
"context" "context"
"errors" "errors"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -32,14 +33,14 @@ func (m *Media) GetUrl() string {
return m.MediaAddress return m.MediaAddress
} }
func (m *Media) GetJoinToken(room, identity string, operationID string) (string, error) { func (m *Media) GetJoinToken(room, identity string, operationID string, data *open_im_sdk.ParticipantMetaData) (string, error) {
conn, err := grpc.Dial(Address, grpc.WithInsecure()) conn, err := grpc.Dial(Address, grpc.WithInsecure())
if err != nil { if err != nil {
return "", err return "", err
} }
defer conn.Close() defer conn.Close()
c := pbRtc.NewRtcServiceClient(conn) c := pbRtc.NewRtcServiceClient(conn)
req := &pbRtc.GetJoinTokenReq{ApiKey: m.ApiKey, ApiSecret: m.ApiSecret, Room: room, OperationID: operationID, Identity: identity} req := &pbRtc.GetJoinTokenReq{ApiKey: m.ApiKey, ApiSecret: m.ApiSecret, Room: room, OperationID: operationID, Identity: identity, MetaData: data}
resp, err := c.GetJoinToken(context.Background(), req) resp, err := c.GetJoinToken(context.Background(), req)
if err != nil { if err != nil {
return "", err return "", err

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

@ -145,7 +145,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
// //
//} //}
token, err2 := media.GetJoinToken(payload.Invite.Invitation.RoomID, payload.Invite.Invitation.InviterUserID, operationID) token, err2 := media.GetJoinToken(payload.Invite.Invitation.RoomID, payload.Invite.Invitation.InviterUserID, operationID, payload.Invite.Participant)
if err2 != nil { if err2 != nil {
return false, 201, err2.Error(), nil, nil return false, 201, err2.Error(), nil, nil
} }
@ -172,7 +172,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
// return false, 201, err.Error(), nil, nil // return false, 201, err.Error(), nil, nil
// //
//} //}
token, err2 := media.GetJoinToken(payload.InviteInGroup.Invitation.RoomID, payload.InviteInGroup.Invitation.InviterUserID, operationID) token, err2 := media.GetJoinToken(payload.InviteInGroup.Invitation.RoomID, payload.InviteInGroup.Invitation.InviterUserID, operationID, payload.InviteInGroup.Participant)
if err2 != nil { if err2 != nil {
return false, 201, err2.Error(), nil, nil return false, 201, err2.Error(), nil, nil
} }
@ -214,7 +214,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
msg.ClientMsgID = utils.GetMsgID(payload.Cancel.OpUserID) msg.ClientMsgID = utils.GetMsgID(payload.Cancel.OpUserID)
return true, 0, "", &resp, &msg return true, 0, "", &resp, &msg
case *open_im_sdk.SignalReq_Accept: case *open_im_sdk.SignalReq_Accept:
token, err2 := media.GetJoinToken(payload.Accept.Invitation.RoomID, payload.Accept.OpUserID, operationID) token, err2 := media.GetJoinToken(payload.Accept.Invitation.RoomID, payload.Accept.OpUserID, operationID, payload.Accept.Participant)
if err2 != nil { if err2 != nil {
return false, 201, err2.Error(), nil, nil return false, 201, err2.Error(), nil, nil
} }