fly преди 4 години
родител
ревизия
1d10ad613b
променени са 2 файла, в които са добавени 3 реда и са изтрити 4 реда
  1. 1 1
      src/Jobs/ExportTaskJob.php
  2. 2 3
      src/Services/Export/AbstractExportTask.php

+ 1 - 1
src/Jobs/ExportTaskJob.php

@@ -44,7 +44,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);
+        $this->task->saveExportTaskFilePath($local_path, $file_name);
         unlink($local_path . '/' . $file_name);
     }
 }

+ 2 - 3
src/Services/Export/AbstractExportTask.php

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