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

internal/msg_gateway/gate/logic.go

@@ -222,7 +222,7 @@ func (ws *WServer) sendSignalMsgReq(conn *UserConn, m *Req) {
 
 	} else {
 		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)
 		} else {
 			ws.sendSignalMsgResp(conn, errCode, errMsg, m, signalResp)

internal/msg_gateway/gate/open_im_media/room.go

@@ -1,7 +1,5 @@
 package open_im_media
 
-import "github.com/livekit/protocol/livekit"
-
 const (
 	MediaAddress = "ws://43.128.5.63:7880"
 	ApiKey       = "APIGPW3gnFTzqHH"
@@ -42,7 +40,7 @@ func init() {
 	//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 roomClient.CreateRoom(context.Background(), &livekit.CreateRoomRequest{
 	//	Name:         roomName,

internal/msg_gateway/gate/validate.go

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