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 remote-tracking branch 'origin/tuoyun' into tuoyun

Browse Source
This commit is contained in:
wenxu12345 2022-03-15 10:57:16 +08:00
commit 2930e49d61
3 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/msg_gateway/gate/logic.go
View File

@ -200,7 +200,7 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) {
nReply := new(pbChat.SendMsgResp) nReply := new(pbChat.SendMsgResp)
isPass, errCode, errMsg, pData := ws.argsValidate(m, constant.WSSendSignalMsg) isPass, errCode, errMsg, pData := ws.argsValidate(m, constant.WSSendSignalMsg)
log.NewInfo(m.OperationID, "args is ", pData.(*sdk_ws.SignalReq)) log.NewInfo(m.OperationID, "args is ", pData.(*sdk_ws.SignalReq))
isPass2, errCode2, errMsg2, signalResp, msgData := ws.signalMessageAssemble(pData.(*sdk_ws.SignalReq)) isPass2, errCode2, errMsg2, signalResp, msgData := ws.signalMessageAssemble(pData.(*sdk_ws.SignalReq), m.OperationID)
if isPass && isPass2 { if isPass && isPass2 {
pbData := pbChat.SendMsgReq{ pbData := pbChat.SendMsgReq{
Token: m.Token, Token: m.Token,

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

@ -1,9 +1,18 @@
package open_im_media package open_im_media
import (
pbRtc "Open_IM/pkg/proto/rtc"
"context"
"errors"
"google.golang.org/grpc"
)
const ( const (
MediaAddress = "ws://43.128.5.63:7880" MediaAddress = "ws://43.128.5.63:7880"
ApiKey = "APIGPW3gnFTzqHH" ApiKey = "APIGPW3gnFTzqHH"
ApiSecret = "23ztfSqsfQ8hKkHzHTl3Z4bvaxro0snjk5jwbp5p6Q3" ApiSecret = "23ztfSqsfQ8hKkHzHTl3Z4bvaxro0snjk5jwbp5p6Q3"
// Address gRPC服务地址
Address = "127.0.0.1:11300"
) )
//var roomClient *lksdk.RoomServiceClient //var roomClient *lksdk.RoomServiceClient
@ -22,8 +31,23 @@ func NewMedia() *Media {
func (m *Media) GetUrl() string { func (m *Media) GetUrl() string {
return m.MediaAddress return m.MediaAddress
} }
func (m *Media) GetJoinToken(room, identity string) (string, error) {
return identity, nil func (m *Media) GetJoinToken(room, identity string, operationID string) (string, error) {
conn, err := grpc.Dial(Address, grpc.WithInsecure())
if err != nil {
return "", err
}
defer conn.Close()
c := pbRtc.NewRtcServiceClient(conn)
req := &pbRtc.GetJoinTokenReq{ApiKey: m.ApiKey, ApiSecret: m.ApiSecret, Room: room, OperationID: operationID, Identity: identity}
resp, err := c.GetJoinToken(context.Background(), req)
if err != nil {
return "", err
}
if resp.CommonResp.ErrCode != 0 {
return "", errors.New(resp.CommonResp.ErrMsg)
}
return resp.Jwt, nil
//at := auth.NewAccessToken(m.ApiKey, m.ApiSecret) //at := auth.NewAccessToken(m.ApiKey, m.ApiSecret)
//grant := &auth.VideoGrant{ //grant := &auth.VideoGrant{
// RoomJoin: true, // RoomJoin: true,

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

@ -117,7 +117,7 @@ func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, er
} }
func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq) (isPass bool, errCode int32, errMsg string, r *open_im_sdk.SignalResp, msgData *open_im_sdk.MsgData) { func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID string) (isPass bool, errCode int32, errMsg string, r *open_im_sdk.SignalResp, msgData *open_im_sdk.MsgData) {
var msg open_im_sdk.MsgData var msg open_im_sdk.MsgData
var resp open_im_sdk.SignalResp var resp open_im_sdk.SignalResp
media := open_im_media.NewMedia() media := open_im_media.NewMedia()
@ -139,12 +139,13 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq) (isPass bool,
msg.Options = options msg.Options = options
switch payload := s.Payload.(type) { switch payload := s.Payload.(type) {
case *open_im_sdk.SignalReq_Invite: case *open_im_sdk.SignalReq_Invite:
_, err := media.CreateRoom(payload.Invite.Invitation.RoomID) //_, err := media.CreateRoom(payload.Invite.Invitation.RoomID)
if err != nil { //if err != nil {
return false, 201, err.Error(), nil, nil // return false, 201, err.Error(), nil, nil
//
//}
} 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)
if err2 != nil { if err2 != nil {
return false, 201, err2.Error(), nil, nil return false, 201, err2.Error(), nil, nil
} }
@ -166,12 +167,12 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq) (isPass bool,
msg.ClientMsgID = utils.GetMsgID(payload.Invite.Invitation.InviterUserID) msg.ClientMsgID = utils.GetMsgID(payload.Invite.Invitation.InviterUserID)
return true, 0, "", &resp, &msg return true, 0, "", &resp, &msg
case *open_im_sdk.SignalReq_InviteInGroup: case *open_im_sdk.SignalReq_InviteInGroup:
_, err := media.CreateRoom(payload.InviteInGroup.Invitation.RoomID) //_, err := media.CreateRoom(payload.InviteInGroup.Invitation.RoomID)
if err != nil { //if err != nil {
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) token, err2 := media.GetJoinToken(payload.InviteInGroup.Invitation.RoomID, payload.InviteInGroup.Invitation.InviterUserID, operationID)
if err2 != nil { if err2 != nil {
return false, 201, err2.Error(), nil, nil return false, 201, err2.Error(), nil, nil
} }
@ -213,7 +214,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq) (isPass bool,
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) token, err2 := media.GetJoinToken(payload.Accept.Invitation.RoomID, payload.Accept.OpUserID, operationID)
if err2 != nil { if err2 != nil {
return false, 201, err2.Error(), nil, nil return false, 201, err2.Error(), nil, nil
} }