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-12-27 17:20:13 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
8fcc268de32b1d5e81b79471c400b807e8588f4c
8fcc268d
1 parent
a0c66c0b
1.微调一下接口,打印参数
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
app/Admin/Controllers/ImmerseController.php
app/Jobs/AdminMakeImmerse.php
app/Admin/Controllers/ImmerseController.php
View file @
8fcc268
...
...
@@ -64,6 +64,12 @@ class ImmerseController extends AdminController
});
$grid
->
column
(
'created_at'
);
$grid
->
column
(
'updated_at'
)
->
sortable
();
$grid
->
filter
(
function
(
Grid\Filter
$filter
)
{
// 展开过滤器
$filter
->
expand
();
$filter
->
like
(
'user_id'
)
->
width
(
4
);
});
});
}
...
...
app/Jobs/AdminMakeImmerse.php
View file @
8fcc268
...
...
@@ -53,7 +53,7 @@ class AdminMakeImmerse implements ShouldQueue
$adminMakeVideo
=
$this
->
adminMakeVideo
;
// 模板
$template
=
$adminMakeVideo
->
temp
(
)
->
first
();
$template
=
$adminMakeVideo
->
temp
->
where
(
'state'
,
1
)
->
first
();
// 素材准备
$drawtext
=
$this
->
getTextContentString
();
...
...
@@ -172,13 +172,13 @@ class AdminMakeImmerse implements ShouldQueue
'temp_id'
=>
$this
->
adminMakeVideo
->
temp_id
,
'thumbnail'
=>
$thumbnail
,
'state'
=>
1
,
'bgm'
=>
$
bgm
??
''
,
'bgm'
=>
$
is_bgm
?
$bgm
:
''
,
]);
}
else
{
// 图文
$image
=
$this
->
getAbsolutePath
(
$adminMakeVideo
->
images_url
);
if
(
$this
->
adminMakeVideo
->
type
==
2
&&
$is_bgm
==
0
){
if
(
$this
->
adminMakeVideo
->
type
==
2
&&
!
$is_bgm
){
// 没有背景音,单图一张,输出为单图。
$output
=
$this
->
getTempPath
(
'.png'
,
false
);
$cmd
=
$this
->
ffmpeg
.
' -y '
.
...
...
@@ -254,7 +254,7 @@ class AdminMakeImmerse implements ShouldQueue
'temp_id'
=>
$this
->
adminMakeVideo
->
temp_id
,
'thumbnail'
=>
$thumbnail
,
'state'
=>
1
,
'bgm'
=>
$
bgm
??
''
,
'bgm'
=>
$
is_bgm
?
$bgm
:
''
,
]);
}
...
...
Please
register
or
login
to post a comment