文件删除

app/common/controller/UploadController.php

@@ -4,6 +4,7 @@ namespace app\common\controller;
 
 use app\common\service\OssService;
 use app\common\service\UploadedFilesService;
+use app\common\service\UploadService;
 use app\common\traits\ResponseTrait;
 use support\Log;
 use support\Request;
@@ -44,7 +45,7 @@ class UploadController
                     $category = $request->input('category', 'general');
                     
                     $fileInfo = [
-                        'file_name' => $fileName,
+                        'file_name' => basename($fileName),
                         'file_path' => $pathUrl,
                         'file_size' => $file->getSize(),
                         'file_type' => $file->getUploadMimeType(),
@@ -162,7 +163,7 @@ class UploadController
             $partition = $scene;
 
             $fileInfo = [
-                'file_name' => $result->file_name,
+                'file_name' => basename($result->file_name),
                 'file_path' => $result->file_name, // OSS存储路径
                 'file_size' => $file->getSize(),
                 'file_type' => $file->getUploadMimeType(),
@@ -220,12 +221,26 @@ class UploadController
     {
         try {
             $fileId = $request->input('id');
-            
-            if (!$fileId) {
-                return $this->error('文件ID不能为空');
-            }
-            
+            $path = $request->input('path');
+
             $uploadedFilesService = new UploadedFilesService();
+            if(!empty($path) && empty($fileId)){
+                $where = ['file_path' => $path];
+                $file = $uploadedFilesService->getFile($where);
+                $fileId = $file->id;
+            }elseif(empty($path) && !empty($fileId)){
+                $where = ['id' => $fileId];
+                $file = $uploadedFilesService->getFile($where);
+                $path = $file->file_path;
+            }
+            if (!$fileId) {
+                return $this->error('文件ID与路径不能为空');
+            }
+
+            // 删除 OSS 上的文件
+            $ossService = new OssService();
+            $ossService->deleteFile($path);
+
             $result = $uploadedFilesService->deleteFile($fileId);
             
             if ($result) {