Toggle navigation
Toggle navigation
This project
Loading...
Sign in
OnePoem
/
OnePoem-Server
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
李帅
2022-03-24 14:30:05 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
5221e6be8a9130246f72ab9bac71cd3af881d90e
5221e6be
1 parent
e0064442
1. 修改合成脚本
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
app/Jobs/MakeVideo.php
config/sanctum.php
app/Jobs/MakeVideo.php
View file @
5221e6b
...
...
@@ -63,7 +63,8 @@ class MakeVideo implements ShouldQueue
$content
=
$adminMakeVideo
->
poem
->
content
;
// 转换logo大小
$watermark
=
$this
->
translateLogo
(
Storage
::
disk
(
'public'
)
->
path
(
'image/logo.jpg'
));
// $watermark = $this->translateLogo(Storage::disk('public')->path('image/logo.jpg'));
$watermark
=
Storage
::
disk
(
'public'
)
->
path
(
'ffmpeg'
)
.
"/LOGO_eng.png"
;
// 生成贴纸和签名
$end_wallpaper
=
$this
->
wallpaperWithSignature
(
$end_wallpaper
,
$thumbnail
,
$signature
,
$font
);
...
...
config/sanctum.php
View file @
5221e6b
...
...
@@ -31,7 +31,7 @@ return [
|
*/
'guard'
=>
[
'web'
,
'api'
],
//
'guard' => ['web','api'],
/*
|--------------------------------------------------------------------------
...
...
Please
register
or
login
to post a comment