Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
media-resource
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨昕
media-resource
Commits
1b238972
Commit
1b238972
authored
Sep 18, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code format
parent
3d5ab378
Pipeline
#11374
passed with stages
in 43 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
MediaModel.php
app/Model/MediaModel.php
+3
-2
No files found.
app/Model/MediaModel.php
View file @
1b238972
...
@@ -179,6 +179,7 @@ class MediaModel extends Eloquent
...
@@ -179,6 +179,7 @@ class MediaModel extends Eloquent
if
(
$request
->
replace
){
if
(
$request
->
replace
){
$recycleId
=
RecycleModel
::
addRecycle
(
$media_id
);
$recycleId
=
RecycleModel
::
addRecycle
(
$media_id
);
self
::
updatehookMedia
(
$request
,
$media_id
);
if
(
!
$recycleId
){
if
(
!
$recycleId
){
throw
new
\Exception
(
'回收站保存失败'
);
throw
new
\Exception
(
'回收站保存失败'
);
}
}
...
@@ -324,7 +325,7 @@ class MediaModel extends Eloquent
...
@@ -324,7 +325,7 @@ class MediaModel extends Eloquent
'media_type_id'
=>
$mediaCatg
[
'_id'
],
'media_type_id'
=>
$mediaCatg
[
'_id'
],
'book_num'
=>
$media_info
[
0
],
'book_num'
=>
$media_info
[
0
],
'book_name'
=>
$media_info
[
1
],
'book_name'
=>
$media_info
[
1
],
// 'media_url' => $request->media_url
,
'media_url'
=>
$request
->
media_url
?
$request
->
media_url
:
$media_info
[
'media_url'
]
,
// 'access_key' => $request->access_key,
// 'access_key' => $request->access_key,
// 'secret_key' => $request->secret_key,
// 'secret_key' => $request->secret_key,
// 'create_time' => $media['create_time'],
// 'create_time' => $media['create_time'],
...
@@ -341,7 +342,7 @@ class MediaModel extends Eloquent
...
@@ -341,7 +342,7 @@ class MediaModel extends Eloquent
'media_type_id'
=>
$mediaCatg
[
'_id'
],
'media_type_id'
=>
$mediaCatg
[
'_id'
],
'book_num'
=>
''
,
'book_num'
=>
''
,
'book_name'
=>
$request
->
media_name
,
'book_name'
=>
$request
->
media_name
,
// 'media_url' => $request->media_url
,
'media_url'
=>
$request
->
media_url
?
$request
->
media_url
:
$media_info
[
'media_url'
]
,
// 'access_key' => $request->access_key,
// 'access_key' => $request->access_key,
// 'secret_key' => $request->secret_key,
// 'secret_key' => $request->secret_key,
// 'create_time' => date('Y-m-d H:i:s',time()),
// 'create_time' => date('Y-m-d H:i:s',time()),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment