1.更改ffmpeg 地址

@@ -95,8 +95,7 @@ class MakeVideo implements ShouldQueue
             escapeshellarg($video);
             escapeshellarg($video);
 
 
         // 执行合成
         // 执行合成
-        $this->execmd($cmd);
-
+        if ($this->execmd($cmd)){
             $video2 = $this->getTempPath();
             $video2 = $this->getTempPath();
             $cmd = $this->ffmpeg . ' -y -i ' . escapeshellarg($video) .
             $cmd = $this->ffmpeg . ' -y -i ' . escapeshellarg($video) .
                 ' -vf '.
                 ' -vf '.
@@ -117,7 +116,7 @@ class MakeVideo implements ShouldQueue
                 Immerse::query()->create([
                 Immerse::query()->create([
                     'user_id' => 1,
                     'user_id' => 1,
                     'title' => '',
                     'title' => '',
-                'content' => $this->adminMakeVideo->feel,
+                    'content' => $this->adminMakeVideo->feel ?? '',
                     'url' => $video2,
                     'url' => $video2,
                     'type' => $this->adminMakeVideo->type == 1 ? 2 : 1,
                     'type' => $this->adminMakeVideo->type == 1 ? 2 : 1,
                     'duration' => $video_info['format']['duration'],
                     'duration' => $video_info['format']['duration'],
@@ -128,9 +127,12 @@ class MakeVideo implements ShouldQueue
                     'bgm' => $this->adminMakeVideo->bgm_url,
                     'bgm' => $this->adminMakeVideo->bgm_url,
                 ]);
                 ]);
             } else {
             } else {
-            Log::info('');
+                Log::info('退出1');
                 return;
                 return;
             }
             }
+        }else{
+            Log::info('退出2');
+        }
 
 
     }
     }