github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 19:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 分享接口修改

Browse Source
This commit is contained in:
weifashi 2023-06-09 15:27:39 +08:00
parent 8c6f1120e4
commit 95ec53381b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Api/UsersController.php
View File

@ -1819,7 +1819,8 @@ class UsersController extends AbstractController
$pid = intval( Request::input('pid',-1) ); $pid = intval( Request::input('pid',-1) );
$uploadFileId = intval(Request::input('upload_file_id',-1)); $uploadFileId = intval(Request::input('upload_file_id',-1));
// 上传文件 // 上传文件
if($uploadFileId !== -1){ if($uploadFileId !== -1 ){
if($pid==-1) $pid = 0;
$webkitRelativePath = Request::input('webkitRelativePath'); $webkitRelativePath = Request::input('webkitRelativePath');
$data = (new File)->contentUpload($user,$pid,$webkitRelativePath); $data = (new File)->contentUpload($user,$pid,$webkitRelativePath);
return Base::retSuccess('success', $data); return Base::retSuccess('success', $data);
@ -1845,21 +1846,24 @@ class UsersController extends AbstractController
'type' => 'children', 'type' => 'children',
'url' => Base::fillUrl("api/users/share/list")."?pid=0", 'url' => Base::fillUrl("api/users/share/list")."?pid=0",
'icon' => url("/images/file/light/folder.svg"), 'icon' => url("/images/file/light/folder.svg"),
'extend' => ['file'=>true], 'extend' => ['upload_file_id'=>0],
'name' => '全部文件', 'name' => '全部文件',
]]; ]];
$dialogList = (new WebSocketDialog)->getDialogList($user->userid); $dialogList = (new WebSocketDialog)->getDialogList($user->userid);
foreach($dialogList['data'] as $dialog){ foreach($dialogList['data'] as $dialog){
if($dialog['type'] == 'user'){ if($dialog['type'] == 'user'){
$avatar = User::getAvatar($dialog['dialog_user']['userid'], $dialog['avatar'], $dialog['email'], $dialog['name']); $avatar = User::getAvatar($dialog['dialog_user']['userid'], $dialog['userimg'], $dialog['email'], $dialog['name']);
}else{ }else{
switch ( $dialog['group_type'] ) { switch ( $dialog['group_type'] ) {
case 'department': case 'department':
$avatar = url("images/avatar/default_department.png"); $avatar = url("images/avatar/default_department.png");
break;
case 'project': case 'project':
$avatar = url("images/avatar/default_project.png"); $avatar = url("images/avatar/default_project.png");
break;
case 'task': case 'task':
$avatar = url("images/avatar/default_task.png"); $avatar = url("images/avatar/default_task.png");
break;
default: default:
$avatar = url("images/avatar/default_people.png"); $avatar = url("images/avatar/default_people.png");
break; break;
@ -1870,7 +1874,7 @@ class UsersController extends AbstractController
'name' => $dialog['name'], 'name' => $dialog['name'],
'icon' => $avatar, 'icon' => $avatar,
'url' => Base::fillUrl("api/dialog/msg/sendfiles"), 'url' => Base::fillUrl("api/dialog/msg/sendfiles"),
'extend' => [ 'dialog_ids' => $dialog['id'] ] 'extend' => ['dialog_ids' => $dialog['id']]
]; ];
} }
} }

4
app/Models/WebSocketDialog.php
View File

@ -68,7 +68,7 @@ class WebSocketDialog extends AbstractModel
/** /**
* 格式化对话 * 获取对话列表
* @param int $userid 会员ID * @param int $userid 会员ID
* @param bool $hasData * @param bool $hasData
* @return $this * @return $this
@ -150,9 +150,9 @@ class WebSocketDialog extends AbstractModel
} }
$basic = User::userid2basic($dialog_user->userid); $basic = User::userid2basic($dialog_user->userid);
if ($basic) { if ($basic) {
$this->avatar = $basic->userimg;
$this->name = $basic->nickname; $this->name = $basic->nickname;
$this->email = $basic->email; $this->email = $basic->email;
$this->userimg = $basic->userimg;
$this->bot = $basic->getBotOwner(); $this->bot = $basic->getBotOwner();
$this->quick_msgs = UserBot::quickMsgs($basic->email); $this->quick_msgs = UserBot::quickMsgs($basic->email);
} else { } else {