blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-24 18:36:19 +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 18:33:16 +08:00
commit 972675d4da
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,7 +222,7 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) {
} else { } else {
if isPass { if isPass {
log.NewError(m.OperationID, isPass2, errCode2, errMsg2, *signalResp, *msgData) log.NewError(m.OperationID, isPass2, errCode2, errMsg2)
ws.sendSignalMsgResp(conn, errCode2, errMsg2, m, signalResp) ws.sendSignalMsgResp(conn, errCode2, errMsg2, m, signalResp)
} else { } else {
ws.sendSignalMsgResp(conn, errCode, errMsg, m, signalResp) ws.sendSignalMsgResp(conn, errCode, errMsg, m, signalResp)

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

@ -1,7 +1,5 @@
package open_im_media package open_im_media
import "github.com/livekit/protocol/livekit"
const ( const (
MediaAddress = "ws://43.128.5.63:7880" MediaAddress = "ws://43.128.5.63:7880"
ApiKey = "APIGPW3gnFTzqHH" ApiKey = "APIGPW3gnFTzqHH"
@ -42,7 +40,7 @@ func init() {
//roomClient = lksdk.NewRoomServiceClient(MediaAddress, ApiKey, ApiSecret) //roomClient = lksdk.NewRoomServiceClient(MediaAddress, ApiKey, ApiSecret)
} }
func (m *Media) CreateRoom(roomName string) (*livekit.Room, error) { func (m *Media) CreateRoom(roomName string) (error, error) {
return nil, nil return nil, nil
//return roomClient.CreateRoom(context.Background(), &livekit.CreateRoomRequest{ //return roomClient.CreateRoom(context.Background(), &livekit.CreateRoomRequest{
// Name: roomName, // Name: roomName,

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

@ -84,7 +84,7 @@ func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, er
return false, 204, err.Error(), nil return false, 204, err.Error(), nil
} }
return true, 0, "", data return true, 0, "", &data
case constant.WSPullMsgBySeqList: case constant.WSPullMsgBySeqList:
data := open_im_sdk.PullMessageBySeqListReq{} data := open_im_sdk.PullMessageBySeqListReq{}
if err := proto.Unmarshal(m.Data, &data); err != nil { if err := proto.Unmarshal(m.Data, &data); err != nil {