Browse Source

推送消息设置称呼错误

master
wanghongjun 4 months ago
parent
commit
e2bd7ffc7d
  1. 5
      app/enterprise/controller/Friend.php
  2. 2
      app/enterprise/model/Message.php

5
app/enterprise/controller/Friend.php

@ -308,7 +308,10 @@ class Friend extends BaseController
$data = Message::setAutoDelMessageNotice($uid, $to_user, $title, 0, $is_close); $data = Message::setAutoDelMessageNotice($uid, $to_user, $title, 0, $is_close);
$data['isMobile'] = $this->request->isMobile() ? 1 : 0; $data['isMobile'] = $this->request->isMobile() ? 1 : 0;
wsSendMsg($to_user, 'undoMessage', $data); $otherData = $data;
$otherData['content'] = lang('im.other'). $data['content'];
wsSendMsg($to_user, 'undoMessage', $otherData);
$data['content'] = lang('im.you'). $data['content'];
return success('', $data); return success('', $data);
} }

2
app/enterprise/model/Message.php

@ -381,8 +381,6 @@ class Message extends BaseModel
$fromUser = $userList[$from_user]; $fromUser = $userList[$from_user];
if ($is_group) { if ($is_group) {
$msgInfo['content'] = $fromUser['realname'] . $data['content']; $msgInfo['content'] = $fromUser['realname'] . $data['content'];
} else {
$msgInfo['content'] = lang('im.other'). $data['content'];
} }
$msgInfo['fromUser'] = $fromUser; $msgInfo['fromUser'] = $fromUser;
$msgInfo['download'] = ''; $msgInfo['download'] = '';

Loading…
Cancel
Save