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
88abd389
Commit
88abd389
authored
Jul 15, 2022
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code format
parent
1225e938
Pipeline
#18919
passed with stages
in 1 minute 1 second
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
19 deletions
+4
-19
MediaController.php
app/Http/Controllers/Api/Client/MediaController.php
+1
-15
AliOssModel.php
app/Model/AliOssModel.php
+3
-3
MediaModel.php
app/Model/MediaModel.php
+0
-1
No files found.
app/Http/Controllers/Api/Client/MediaController.php
View file @
88abd389
...
...
@@ -38,28 +38,20 @@ class MediaController extends Controller
public
function
index
(
Request
$request
){
$result
=
handler_drive
(
function
()
use
(
$request
)
{
$i
=
0
;
do
{
$media_id
=
"mda-"
.
generateRandomNum
(
16
);
$media
=
MediaModel
::
find
(
$media_id
);
$i
++
;
}
while
(
$i
<
3
&&
!
empty
(
$media
)
);
if
(
$i
==
3
){
return
0
;
}
return
[
"mediaID"
=>
$media_id
];
});
if
(
!
$result
){
return
error
(
"mediaID重复生成次数太多"
);
}
return
success
(
$result
);
}
...
...
@@ -68,6 +60,7 @@ class MediaController extends Controller
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
* @throws \App\Exceptions\DatabaseException
*/
public
function
getUploadMediaToken
(
Request
$request
){
...
...
@@ -111,11 +104,7 @@ class MediaController extends Controller
*/
public
function
hookRestoreMedia
(
Request
$request
){
// $this->testUploadFile($request);
$id
=
handler_drive
(
function
()
use
(
$request
)
{
SrsHookValidate
::
srsHookCallback
(
$request
,
array_merge
([
'media_name'
=>
'required'
,
'media_type'
=>
'required'
,
...
...
@@ -135,10 +124,7 @@ class MediaController extends Controller
'end_time.date'
=>
'结束时间格式错误'
,
'end_time.after_or_equal'
=>
'结束时间不能小于开始时间'
]);
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'status'
=>
"1"
]));
$id
=
MediaModel
::
hookRestoreMedia
(
$request
);
return
$id
;
...
...
app/Model/AliOssModel.php
View file @
88abd389
...
...
@@ -7,6 +7,9 @@ const OSS_ROLE_RAN = "acs:ram::1325723521662517:role/oss-client-mam";
const
OSS_ROLE_SESSION_NAME
=
"client-001"
;
class
AliOssModel
{
/**
* @throws DatabaseException
*/
public
static
function
getAilOssToken
(
$request
){
try
{
...
...
@@ -27,11 +30,9 @@ class AliOssModel
if
(
$result
[
"code"
]
!=
0
){
throw
new
\Exception
(
"获取token失败"
);
}
}
catch
(
\Exception
$exception
){
throw
new
DatabaseException
(
$exception
->
getMessage
());
}
return
$result
[
"data"
];
}
}
\ No newline at end of file
app/Model/MediaModel.php
View file @
88abd389
...
...
@@ -297,7 +297,6 @@ class MediaModel extends Eloquent
{
try
{
$media
=
MediaModel
::
find
(
$id
);
if
(
empty
(
$media
))
{
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