1.重新整合ffmpeg命令

@@ -14,6 +14,7 @@ use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Show;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 
 class AdminMakeVideoController extends AdminController
 class AdminMakeVideoController extends AdminController
 {
 {
@@ -31,7 +32,7 @@ class AdminMakeVideoController extends AdminController
             $grid->column('title','标题');
             $grid->column('title','标题');
             $grid->column('content','有感');
             $grid->column('content','有感');
             $grid->column('url')->display(function ($url){
             $grid->column('url')->display(function ($url){
-                return "<a target='_blank' href='". Storage::disk('public')->url($url) ."'>查看</a>";
+                return "<a target='_blank' href='". Storage::disk('public')->url(Str::before($url,'/public')) ."'>查看</a>";
             });
             });
             $grid->column('type','类型')->using([1 => '音频', 2 => '视频']);
             $grid->column('type','类型')->using([1 => '音频', 2 => '视频']);
             $grid->column('duration');
             $grid->column('duration');

@@ -404,7 +404,7 @@ class MakeVideo implements ShouldQueue
     {
     {
         $filename = "/output_" . time() . rand(0, 10000);
         $filename = "/output_" . time() . rand(0, 10000);
 
 
-        $prefix = $is_temp ? 'temp/' : 'video';
+        $prefix = $is_temp ? 'temp/' : 'video/';
         $hash_hex = md5($filename);
         $hash_hex = md5($filename);
         // 16进制表示的字符串一共32字节，表示16个二进制字节。
         // 16进制表示的字符串一共32字节，表示16个二进制字节。
         // 前16个字符用来第一级求摸，后16个用做第二级
         // 前16个字符用来第一级求摸，后16个用做第二级