0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed:修复附件无法删除

Browse Source
This commit is contained in:
JaguarJack
2021-03-01 21:01:37 +08:00
parent 17491ca7da
commit c3b36013d7
5 changed files with 99 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
catch/system/controller/Attachments.php
View File

@@ -4,8 +4,6 @@ namespace catchAdmin\system\controller;
use catcher\base\CatchController;
use catcher\CatchResponse;
use catchAdmin\system\model\Attachments as AttachmentsModel;
use catcher\Utils;
use catcher\facade\FileSystem;
class Attachments extends CatchController
{
@@ -35,22 +33,6 @@ class Attachments extends CatchController
*/
public function delete($id, AttachmentsModel $model)
{
$attachments = $model->whereIn('id', Utils::stringToArrayBy($id))->select();
if ($model->deleteBy($id)) {
foreach ($attachments as $attachment) {
if ($attachment->driver == 'local') {
$localPath = config('filesystem.disks.local.root') . DIRECTORY_SEPARATOR;
$path = $localPath . str_replace('\\','\/', $attachment->path);
if (FileSystem::exists($path)) {
Filesystem::delete($path);
}
} else {
Filesystem::delete($attachment->path);
}
}
}
return CatchResponse::success();
return CatchResponse::success($model->deletes($id));
}
}