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
3d5ab378
Commit
3d5ab378
authored
Sep 18, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
替换播放链接
parent
f6a558cf
Pipeline
#11373
passed with stages
in 47 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
13 deletions
+11
-13
MediaController.php
app/Http/Controllers/Api/Client/MediaController.php
+0
-1
MediaModel.php
app/Model/MediaModel.php
+11
-12
No files found.
app/Http/Controllers/Api/Client/MediaController.php
View file @
3d5ab378
...
...
@@ -127,7 +127,6 @@ class MediaController extends Controller
'secret_key'
=>
''
,
'media_url'
=>
'required'
,
'description'
=>
''
,
'replace'
=>
''
// 'start_time' => 'required|date',
// 'end_time' => 'required|date|after_or_equal:start_time',
]);
...
...
app/Model/MediaModel.php
View file @
3d5ab378
...
...
@@ -177,10 +177,18 @@ class MediaModel extends Eloquent
$media_id
=
$request
->
media_id
;
$media
=
MediaModel
::
where
(
"_id"
,
$media_id
)
->
first
();
if
(
$request
->
replace
){
$recycleId
=
RecycleModel
::
addRecycle
(
$media_id
);
if
(
!
$recycleId
){
throw
new
\Exception
(
'回收站保存失败'
);
}
}
else
{
$media
=
MediaModel
::
where
(
"_id"
,
$media_id
)
->
first
();
if
(
!
empty
(
$media
)){
throw
new
\Exception
(
"媒资编号已被使用"
);
if
(
!
empty
(
$media
)){
throw
new
\Exception
(
"媒资编号已被使用"
);
}
}
//hb15011&河北公务员考试试题
...
...
@@ -304,15 +312,6 @@ class MediaModel extends Eloquent
throw
new
\Exception
(
"媒资类别不存在"
);
}
if
(
$request
->
replace
){
$recycleId
=
RecycleModel
::
addRecycle
(
$id
);
if
(
!
$recycleId
){
throw
new
\Exception
(
'回收站保存失败'
);
}
}
/**
* 处理文件名称,确认是否包含"&"符合
*/
...
...
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