diff --git a/app/Http/Admin/Controllers/UploadController.php b/app/Http/Admin/Controllers/UploadController.php index 06667238..6c51b97e 100644 --- a/app/Http/Admin/Controllers/UploadController.php +++ b/app/Http/Admin/Controllers/UploadController.php @@ -40,8 +40,9 @@ class UploadController extends Controller } $data = [ + 'id' => $file->id, + 'name' => $file->name, 'url' => $service->getImageUrl($file->path), - 'title' => $file->name, ]; return $this->jsonSuccess(['data' => $data]); @@ -61,8 +62,9 @@ class UploadController extends Controller } $data = [ + 'id' => $file->id, + 'name' => $file->name, 'url' => $service->getImageUrl($file->path), - 'title' => $file->name, ]; return $this->jsonSuccess(['data' => $data]); @@ -82,8 +84,9 @@ class UploadController extends Controller } $data = [ + 'id' => $file->id, + 'name' => $file->name, 'url' => $service->getImageUrl($file->path), - 'title' => $file->name, ]; return $this->jsonSuccess(['data' => $data]); @@ -100,7 +103,7 @@ class UploadController extends Controller if (!$file) { return $this->jsonError([ - 'message' => '上传图片失败', + 'message' => '上传文件失败', 'error' => 1, ]); } diff --git a/app/Http/Api/Controllers/UploadController.php b/app/Http/Api/Controllers/UploadController.php index 354a2c84..6ee9393e 100644 --- a/app/Http/Api/Controllers/UploadController.php +++ b/app/Http/Api/Controllers/UploadController.php @@ -30,8 +30,9 @@ class UploadController extends Controller } $data = [ + 'id' => $file->id, + 'name' => $file->name, 'url' => $service->getImageUrl($file->path), - 'title' => $file->name, ]; return $this->jsonSuccess(['data' => $data]); diff --git a/app/Http/Home/Controllers/UploadController.php b/app/Http/Home/Controllers/UploadController.php index ed699c8b..5154e9d6 100644 --- a/app/Http/Home/Controllers/UploadController.php +++ b/app/Http/Home/Controllers/UploadController.php @@ -39,17 +39,18 @@ class UploadController extends Controller } $data = [ + 'id' => $file->id, + 'name' => $file->name, 'url' => $service->getImageUrl($file->path), - 'title' => $file->name, ]; return $this->jsonSuccess(['data' => $data]); } /** - * @Post("/editor/img", name="home.upload.editor_img") + * @Post("/content/img", name="home.upload.content_img") */ - public function uploadEditorImageAction() + public function uploadContentImageAction() { $service = new StorageService(); @@ -57,7 +58,7 @@ class UploadController extends Controller if (!$file) { return $this->jsonError([ - 'message' => '上传图片失败', + 'message' => '上传文件失败', 'error' => 1, ]); } diff --git a/public/static/admin/js/course.resource.js b/public/static/admin/js/course.resource.js index e8be73e8..9d1c4654 100644 --- a/public/static/admin/js/course.resource.js +++ b/public/static/admin/js/course.resource.js @@ -117,7 +117,8 @@ layui.use(['jquery', 'element', 'layer'], function () { function getFileExtension(filename) { var index = filename.lastIndexOf('.'); - return filename.substr(index + 1); + if (index === -1) return ''; + return filename.slice(index + 1); } function loadResourceList() {