|
@@ -3,7 +3,8 @@ declare(strict_types=1);
|
|
|
|
|
|
|
|
namespace SixShop\Filesystem\Controller;
|
|
namespace SixShop\Filesystem\Controller;
|
|
|
|
|
|
|
|
-use SixShop\Core\Helper;
|
|
|
|
|
|
|
+use function SixShop\Core\success_response;
|
|
|
|
|
+use function SixShop\Core\page_response;
|
|
|
use SixShop\Filesystem\Entity\FilesystemFileEntity;
|
|
use SixShop\Filesystem\Entity\FilesystemFileEntity;
|
|
|
use SixShop\System\Middleware\MacroPageMiddleware;
|
|
use SixShop\System\Middleware\MacroPageMiddleware;
|
|
|
use think\facade\Event;
|
|
use think\facade\Event;
|
|
@@ -23,7 +24,7 @@ class FileController
|
|
|
'keyword/s',
|
|
'keyword/s',
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
- return Helper::page_response($filesystemFileEntity->getPage($params, $request->pageAndLimit()));
|
|
|
|
|
|
|
+ return page_response($filesystemFileEntity->getPage($params, $request->pageAndLimit()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function save(Request $request, FilesystemFileEntity $filesystemFileEntity): Response
|
|
public function save(Request $request, FilesystemFileEntity $filesystemFileEntity): Response
|
|
@@ -46,14 +47,14 @@ class FileController
|
|
|
|
|
|
|
|
$result = $filesystemFileEntity->upload($categoryId, $file);
|
|
$result = $filesystemFileEntity->upload($categoryId, $file);
|
|
|
|
|
|
|
|
- return Helper::success_response($result);
|
|
|
|
|
|
|
+ return success_response($result);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function delete(int $id, FilesystemFileEntity $filesystemFileEntity): Response
|
|
public function delete(int $id, FilesystemFileEntity $filesystemFileEntity): Response
|
|
|
{
|
|
{
|
|
|
$result = $filesystemFileEntity->destroy($id);
|
|
$result = $filesystemFileEntity->destroy($id);
|
|
|
Event::trigger('after_filesystem_delete', $id);
|
|
Event::trigger('after_filesystem_delete', $id);
|
|
|
- return Helper::success_response($result);
|
|
|
|
|
|
|
+ return success_response($result);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function update(int $id, Request $request, FilesystemFileEntity $filesystemFileEntity): Response
|
|
public function update(int $id, Request $request, FilesystemFileEntity $filesystemFileEntity): Response
|
|
@@ -62,6 +63,6 @@ class FileController
|
|
|
'name/s' => '',
|
|
'name/s' => '',
|
|
|
]);
|
|
]);
|
|
|
$result = $filesystemFileEntity->update($data, ['id' => $id]);
|
|
$result = $filesystemFileEntity->update($data, ['id' => $id]);
|
|
|
- return Helper::success_response($result);
|
|
|
|
|
|
|
+ return success_response($result);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|