|
|
@ -261,6 +261,7 @@ class Message extends BaseModel |
|
|
$sendData['toContactId']=$uid; |
|
|
$sendData['toContactId']=$uid; |
|
|
} |
|
|
} |
|
|
$sendData['fromUser']['id']=(int)$sendData['fromUser']['id']; |
|
|
$sendData['fromUser']['id']=(int)$sendData['fromUser']['id']; |
|
|
|
|
|
$sendData['from_user']=(int)$sendData['fromUser']['id']; |
|
|
$sendData['fileSize']=$fileSzie; |
|
|
$sendData['fileSize']=$fileSzie; |
|
|
$sendData['fileName']=$fileName; |
|
|
$sendData['fileName']=$fileName; |
|
|
if(in_array($sendData['type'],self::$fileType)){ |
|
|
if(in_array($sendData['type'],self::$fileType)){ |
|
|
@ -285,6 +286,7 @@ class Message extends BaseModel |
|
|
$user=new User(); |
|
|
$user=new User(); |
|
|
// 将聊天窗口的联系人信息带上,方便临时会话 |
|
|
// 将聊天窗口的联系人信息带上,方便临时会话 |
|
|
$sendData['contactInfo']=$user->setContact($sendData['toContactId'],$is_group,$sendData['type'],$sendData['content']); |
|
|
$sendData['contactInfo']=$user->setContact($sendData['toContactId'],$is_group,$sendData['type'],$sendData['content']); |
|
|
|
|
|
$sendData['toContactId']=$data['to_user']; |
|
|
// 向发送方发送消息 |
|
|
// 向发送方发送消息 |
|
|
wsSendMsg($toContactId,$type,$sendData,$is_group); |
|
|
wsSendMsg($toContactId,$type,$sendData,$is_group); |
|
|
// 判断图片查看 |
|
|
// 判断图片查看 |
|
|
|