OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
5221e6be 1 parent e0064442

1. 修改合成脚本

Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
...@@ -63,7 +63,8 @@ class MakeVideo implements ShouldQueue ...@@ -63,7 +63,8 @@ class MakeVideo implements ShouldQueue
63 $content = $adminMakeVideo->poem->content; 63 $content = $adminMakeVideo->poem->content;
64 64
65 // 转换logo大小 65 // 转换logo大小
66 - $watermark = $this->translateLogo(Storage::disk('public')->path('image/logo.jpg')); 66 +// $watermark = $this->translateLogo(Storage::disk('public')->path('image/logo.jpg'));
67 + $watermark = Storage::disk('public')->path('ffmpeg') . "/LOGO_eng.png";
67 68
68 // 生成贴纸和签名 69 // 生成贴纸和签名
69 $end_wallpaper = $this->wallpaperWithSignature($end_wallpaper, $thumbnail, $signature, $font); 70 $end_wallpaper = $this->wallpaperWithSignature($end_wallpaper, $thumbnail, $signature, $font);
......
...@@ -31,7 +31,7 @@ return [ ...@@ -31,7 +31,7 @@ return [
31 | 31 |
32 */ 32 */
33 33
34 - 'guard' => ['web','api'], 34 +// 'guard' => ['web','api'],
35 35
36 /* 36 /*
37 |-------------------------------------------------------------------------- 37 |--------------------------------------------------------------------------
......