ok

src/Jobs/ExportTaskJob.php

@@ -2,7 +2,6 @@
 
 namespace General\Jobs;
 
-use General\Helpers\AliOSSHelper;
 use General\Helpers\ExcelHelper;
 use General\Services\Export\AbstractDataExportHandle;
 use General\Services\Export\AbstractExportTask;
@@ -44,7 +43,7 @@ class ExportTaskJob implements ShouldQueue
         $file_name = md5($task_model->id . strtotime($task_model->created_at)) . ".csv";
         $local_path = storage_path('tmp');
         ExcelHelper::saveFileCsv($headers, $data, $file_name, $local_path);
-        $this->task->saveExportTaskFilePath($local_path, $file_name);
+        $this->task->saveExportTaskFile($local_path, $file_name);
         unlink($local_path . '/' . $file_name);
     }
 }

src/Services/Export/AbstractExportTask.php

@@ -64,12 +64,12 @@ abstract class AbstractExportTask
     /**
      * 保存文件
      */
-    public function saveExportTaskFilePath(string $local_path, string $file_name)
+    public function saveExportTaskFile(string $local_path, string $file_name)
     {
         $service = new AliOSSHelper;
         $oss_path = $service->uploadFile("reports/" . $file_name, $local_path . '/' . $file_name);
         if ($oss_path) {
-            $this->model->file_path = $oss_path;
+            $this->model->file_path = "reports/" . $file_name;
             $this->setStatus(self::complete);
         } else {
             $this->task->setStatus(self::failure);
@@ -78,7 +78,7 @@ abstract class AbstractExportTask
     /**
      * 删除文件
      */
-    public function delOssFile()
+    public function delExportTaskFile()
     {
         $service = new AliOSSHelper;
         $service->delFile($this->model->file_path);