mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '增加消息唯一标识字段' () from zhangwei into dev

Browse Source 
Reviewed-on:
This commit is contained in:
weiz 2023-10-09 09:45:49 +08:00
commit 63d91277f1
1 changed files with 8 additions and 4 deletions

12
app/common/controller/ImController.php

@ -88,9 +88,9 @@ class ImController extends BaseLikeAdminController
return $this->fail('请求方式错误');
}
//获取请求参数
$params = $this->request->post(['from_user_id','to_user_id','content','type','scene']);
$params = $this->request->post(['from_user_id','to_user_id','msg_id','content','type','scene']);
//验证请求参数
if(empty($params['from_user_id']) || empty($params['to_user_id']) || empty($params['content']) || empty($params['type']) || !isset($params['scene'])){
if(empty($params['from_user_id']) || empty($params['to_user_id']) || empty($params['content']) || empty($params['msg_id']) || empty($params['type']) || !isset($params['scene'])){
return $this->fail('参数错误');
}
if($params['type'] !== 'text'){
@ -114,6 +114,7 @@ class ImController extends BaseLikeAdminController
'from_user_id' => $params['from_user_id'],
'to_user_id' => $params['to_user_id'],
'content' => $params['content'],
'msg_id' => $params['msg_id'],
'type' => $params['type'],
'is_read' => 0,
'is_undo' => 0,
@ -138,6 +139,7 @@ class ImController extends BaseLikeAdminController
'to_user_name' => $toUserInfo['name'],
'to_user_avatar' => $toUserInfo['avatar'],
'content' => $params['content'],
'msg_id' => $params['msg_id'],
'type' => $params['type'],
'is_read' => 0,
'create_time' => $saveData['create_time'],
@ -164,10 +166,10 @@ class ImController extends BaseLikeAdminController
return $this->fail('请求方式错误');
}
//获取请求参数
$params = $this->request->post(['from_user_id','to_user_id','type','scene']);
$params = $this->request->post(['from_user_id','to_user_id','msg_id','type','scene']);
//获取参数
$file = $this->request->file('file');
if(empty($file) || empty($params['from_user_id']) || empty($params['to_user_id']) || empty($params['type']) || !isset($params['scene'])){
if(empty($file) || empty($params['from_user_id']) || empty($params['to_user_id']) || empty($params['msg_id']) || empty($params['type']) || !isset($params['scene'])){
return $this->fail('参数错误');
}
if(!in_array($params['type'],['image','video'])){
@ -208,6 +210,7 @@ class ImController extends BaseLikeAdminController
'from_user_id' => $params['from_user_id'],
'to_user_id' => $params['to_user_id'],
'content' => $result['data'],
'msg_id' => $params['msg_id'],
'type' => $params['type'],
'is_read' => 0,
'is_undo' => 0,
@ -231,6 +234,7 @@ class ImController extends BaseLikeAdminController
'to_user_name' => $toUserInfo['name'],
'to_user_avatar' => $toUserInfo['avatar'],
'content' => $result['data'],
'msg_id' => $params['msg_id'],
'type' => $params['type'],
'is_read' => 0,
'create_time' => $saveData['create_time'],