wzq 5 年之前
父節點
當前提交
e40f4d968b
共有 1 個文件被更改,包括 8 次插入7 次删除
  1. 8 7
      app/Console/Commands/Downloads.php

+ 8 - 7
app/Console/Commands/Downloads.php

@@ -61,26 +61,27 @@ class Downloads extends Command
         if(!$download) exit;
 
         if($download->download_type == 'post'){
-            $filePath = $fileDir .$download->username.'内容-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
+            $fileName = '内容-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
         }elseif($download->download_type == 'post_waste'){
-            $filePath = $fileDir .$download->username.'回收站内容-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
+            $fileName = '回收站内容-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
         }elseif($download->download_type == 'registered_record'){
-            $filePath = $fileDir .$download->username.'新用户注册账本-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
+            $fileName = '新用户注册账本-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
         }elseif($download->download_type == 'comment_record'){
-            $filePath = $fileDir .$download->username.'评论账本-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
+            $fileName = '评论账本-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
         }elseif($download->download_type == 'release_record'){
-            $filePath = $fileDir .$download->username.'发布账本-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
+            $fileName = '发布账本-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
         }elseif($download->download_type == 'general_record'){
-            $filePath = $fileDir .$download->username.'唯一/普通行为账本-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
+            $fileName = '唯一/普通行为账本-'.Carbon::now()->format('Y-m-d') .'_' .uniqid() .'.csv';
         }else{
             exit;
         }
         $download->download_status = 1;
         $download->save();
 
+        $filePath = $fileDir .$download->username.$fileName;
         try {
             $this->postRepository->download($filePath, $download->download_type, json_decode($download->params, true));
-            Storage::put($filePath, file_get_contents(public_path($filePath)));
+            Storage::put(public_path($filePath), file_get_contents($fileName));
             $download->url = $filePath;
             $download->download_status = 2;
             $download->save();