文件存储支持s3

app/Console/Commands/ExportChapter.php

@@ -330,26 +330,30 @@ class ExportChapter extends Command
         $this->setStatus(0.95,'export content done');
 
         //upload
+        $fileDate = '';
         switch ($this->option('format')) {
             case 'tex':
                 $data = Export::ToPdf($tex);
                 if($data['ok']){
-                    $filename = "export/".$this->argument('filename');
                     $this->info($data['content-type']);
-                    Storage::put($filename, $data['data']);
+                    $fileDate = $data['data'];
                 }else{
                     $this->error($data['code'].'-'.$data['message']);
                 }
                 break;
             case 'html':
-                $filename = "export/".$this->argument('filename');
                 $file = array();
                 foreach ($tex as $key => $section) {
                     $file[] = $section['content'];
                 }
-                Storage::put($filename, implode('',$file));
+                $fileDate = implode('',$file);
                 break;
         }
+        $filename = $this->argument('filename');
+        $bucket = config('mint.attachments.bucket_name.temporary');
+        $tmpFile =  $bucket.'/'. $filename ;
+        Storage::put($tmpFile, $fileDate);
+
         $this->setStatus(1,'export done filename='.$filename);
         Log::debug('task export offline chapter-table finished');
         return 0;

app/Http/Controllers/ExportController.php

@@ -24,11 +24,15 @@ class ExportController extends Controller
         $filename = $request->get('book').'-'.
                     $request->get('par').'-'.
                     Str::uuid().'.'.$request->get('format');
+
+
         Mq::publish('export',[
             'book'=>$request->get('book'),
             'para'=>$request->get('par'),
             'channel'=>$request->get('channel'),
             'format'=>$request->get('format'),
+            'origin'=>$request->get('origin'),
+            'translation'=>$request->get('translation'),
             'filename'=>$filename,
         ]);
         return $this->ok($filename);
@@ -63,11 +67,13 @@ class ExportController extends Controller
         $output = array();
         $output['status'] = $exportStatus;
         if($exportStatus['progress']===1){
+            $bucket = config('mint.attachments.bucket_name.temporary');
+            $tmpFile =  $bucket.'/'. $filename ;
             if (App::environment('local')) {
-                $s3Link = Storage::url('export/'.$filename);
+                $s3Link = Storage::url($tmpFile);
             }else{
                 try{
-                    $s3Link = Storage::temporaryUrl('export/'.$filename, now()->addDays(1));
+                    $s3Link = Storage::temporaryUrl($tmpFile, now()->addDays(7));
                 }catch(\Exception $e){
                     Log::error('export {Exception}',['exception'=>$e]);
                     return $this->error('temporaryUrl fail',404,404);