diff --git a/app/common/controller/ImController.php b/app/common/controller/ImController.php index 885db5746..86aabebb4 100644 --- a/app/common/controller/ImController.php +++ b/app/common/controller/ImController.php @@ -77,7 +77,7 @@ class ImController extends BaseLikeAdminController return $this->fail('场景错误'); } Gateway::bindUid($params['client_id'], $this->sceneText($params['scene']).'_'.$params['user_id']); - return $this->success('绑定成功'); + return $this->success('绑定成功',['msg'=>$this->sceneText($params['scene']).'_'.$params['user_id']]); } //发送消息 @@ -280,6 +280,22 @@ class ImController extends BaseLikeAdminController $params['page_no'] -= 1; $sql = "SELECT id,from_user_id,to_user_id,content,type,is_read,create_time,extends FROM la_user_im_message WHERE (from_user_id = {$params['from_user_id']} AND to_user_id = {$params['to_user_id']}) OR (from_user_id = {$params['to_user_id']} AND to_user_id = {$params['from_user_id']}) ORDER BY create_time DESC LIMIT {$params['page_no']},{$params['page_size']}"; $msgData = Db::query($sql); + foreach($msgData as $k=>$v){ + if($v['from_user_id'] == $params['from_user_id']){ + $msgData[$k]['from_user_name'] = $fromUserInfo['name']; + $msgData[$k]['from_user_avatar'] = $fromUserInfo['avatar']; + }else{ + $msgData[$k]['from_user_name'] = $toUserInfo['name']; + $msgData[$k]['from_user_avatar'] = $toUserInfo['avatar']; + } + if($v['to_user_id'] == $params['to_user_id']){ + $msgData[$k]['to_user_name'] = $toUserInfo['name']; + $msgData[$k]['to_user_avatar'] = $toUserInfo['avatar']; + }else{ + $msgData[$k]['to_user_name'] = $fromUserInfo['name']; + $msgData[$k]['to_user_avatar'] = $fromUserInfo['avatar']; + } + } //返回数据 return $this->success('请求成功',$msgData); }