diff --git a/app/Http/Admin/Controllers/UploadController.php b/app/Http/Admin/Controllers/UploadController.php index 26c76045..73e34e5e 100644 --- a/app/Http/Admin/Controllers/UploadController.php +++ b/app/Http/Admin/Controllers/UploadController.php @@ -99,43 +99,16 @@ class UploadController extends Controller $file = $service->uploadContentImage(); if (!$file) { - return $this->jsonError(['msg' => '上传文件失败']); + return $this->jsonError([ + 'message' => '上传图片失败', + 'error' => 1, + ]); } - $data = [ - 'src' => $service->getImageUrl($file->path), - 'title' => $file->name, - ]; - - return $this->jsonSuccess(['data' => $data]); - } - - /** - * @Post("/remote/img", name="admin.upload.remote_img") - */ - public function uploadRemoteImageAction() - { - $originalUrl = $this->request->getPost('url', ['trim', 'string']); - - $service = new StorageService(); - - $file = $service->uploadRemoteImage($originalUrl); - - $newUrl = $originalUrl; - - if ($file) { - $newUrl = $service->getImageUrl($file->path); - } - - /** - * 编辑器要求返回的数据结构 - */ - $data = [ - 'url' => $newUrl, - 'originalURL' => $originalUrl, - ]; - - return $this->jsonSuccess(['data' => $data]); + return $this->jsonSuccess([ + 'url' => $service->getImageUrl($file->path), + 'error' => 0, + ]); } /** diff --git a/app/Http/Home/Controllers/UploadController.php b/app/Http/Home/Controllers/UploadController.php index c2b403db..2e1f0f4d 100644 --- a/app/Http/Home/Controllers/UploadController.php +++ b/app/Http/Home/Controllers/UploadController.php @@ -56,43 +56,16 @@ class UploadController extends Controller $file = $service->uploadContentImage(); if (!$file) { - return $this->jsonError(['msg' => '上传文件失败']); + return $this->jsonError([ + 'message' => '上传图片失败', + 'error' => 1, + ]); } - $data = [ - 'src' => $service->getImageUrl($file->path), - 'title' => $file->name, - ]; - - return $this->jsonSuccess(['data' => $data]); - } - - /** - * @Post("/remote/img", name="home.upload.remote_img") - */ - public function uploadRemoteImageAction() - { - $originalUrl = $this->request->getPost('url', ['trim', 'string']); - - $service = new StorageService(); - - $file = $service->uploadRemoteImage($originalUrl); - - $newUrl = $originalUrl; - - if ($file) { - $newUrl = $service->getImageUrl($file->path); - } - - /** - * 编辑器要求返回的数据结构 - */ - $data = [ - 'url' => $newUrl, - 'originalURL' => $originalUrl, - ]; - - return $this->jsonSuccess(['data' => $data]); + return $this->jsonSuccess([ + 'url' => $service->getImageUrl($file->path), + 'error' => 0, + ]); } } \ No newline at end of file