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
540b6161
Commit
540b6161
authored
Aug 24, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改第三方修改房间接口
parent
470846e3
Pipeline
#10840
passed with stages
in 45 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
74 additions
and
6 deletions
+74
-6
MediaController.php
app/Http/Controllers/Api/MediaController.php
+64
-4
MediaModel.php
app/Model/MediaModel.php
+10
-2
No files found.
app/Http/Controllers/Api/MediaController.php
View file @
540b6161
...
@@ -5,10 +5,12 @@ namespace App\Http\Controllers\Api;
...
@@ -5,10 +5,12 @@ namespace App\Http\Controllers\Api;
use
App\Exceptions\FormException
;
use
App\Exceptions\FormException
;
use
App\Model\MediaModel
;
use
App\Model\MediaModel
;
use
App\Model\QiniuModel
;
use
App\Model\QiniuModel
;
use
App\Tool\Constant
;
use
App\Tool\SrsHookValidate
;
use
App\Tool\SrsHookValidate
;
use
Carbon\Carbon
;
use
Carbon\Carbon
;
use
Illuminate\Http\Request
;
use
Illuminate\Http\Request
;
use
App\Http\Controllers\Controller
;
use
App\Http\Controllers\Controller
;
use
Illuminate\Support\Facades\DB
;
use
MongoBinData
;
use
MongoBinData
;
use
MongoDB\BSON\UTCDateTime
;
use
MongoDB\BSON\UTCDateTime
;
...
@@ -73,19 +75,64 @@ class MediaController extends Controller
...
@@ -73,19 +75,64 @@ class MediaController extends Controller
'page_size'
=>
'integer'
,
'page_size'
=>
'integer'
,
'start_time'
=>
'date'
,
'start_time'
=>
'date'
,
'end_time'
=>
'date'
,
'end_time'
=>
'date'
,
'category_id'
=>
''
]);
]);
if
(
!
isset
(
$request
->
media_type
_id
)){
if
(
!
isset
(
$request
->
category
_id
)){
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'
media_type
_id'
=>
'5efa9cb5d16f5a214671fd86'
]));
$request
->
replace
(
array_merge
(
$request
->
all
(),[
'
category
_id'
=>
'5efa9cb5d16f5a214671fd86'
]));
}
}
return
MediaModel
::
mediaList
(
$request
);
return
MediaModel
::
mediaList
(
$request
);
});
});
return
success
(
$res
);
return
success
(
$res
);
}
}
public
function
test
(
Request
$request
){
$res
=
[];
for
(
$i
=
0
;
$i
<=
5
;
$i
++
){
$url
=
"http://eoffcn.com/api/user/media_list_once?page="
.
$i
.
'&page_size=1000'
;
$result
=
http_request_code
(
$url
,
null
,
'GET'
);
$medias
=
json_decode
(
$result
,
true
);
if
(
isset
(
$medias
[
'data'
][
'data'
])
&&
!
empty
(
$medias
[
'data'
][
'data'
])){
$data
=
$medias
[
'data'
][
'data'
];
if
(
!
empty
(
$data
)){
foreach
(
$data
as
$media
){
$tmp_arr
=
MediaModel
::
where
(
"media_name"
,
$media
[
'media_name'
])
->
where
(
"media_type_id"
,
"5efa9ca25b742508e81f2d55"
)
->
get
();
if
(
count
(
$tmp_arr
)
>=
2
){
var_dump
(
$media
);
MediaModel
::
deleteMediaById
(
$request
,
$media
[
"_id"
]);
}
}
}
}
echo
"sleep"
;
}
return
success
(
$res
);
}
/**
/**
* @param Request $request
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @return \Illuminate\Http\JsonResponse
...
@@ -168,8 +215,21 @@ class MediaController extends Controller
...
@@ -168,8 +215,21 @@ class MediaController extends Controller
$id
=
handler_drive
(
function
()
use
(
$request
,
$media_id
)
{
$id
=
handler_drive
(
function
()
use
(
$request
,
$media_id
)
{
SrsHookValidate
::
srsHookCallback
(
$request
,[
SrsHookValidate
::
srsHookCallback
(
$request
,[
'status'
=>
''
'status'
=>
''
,
]);
'secret_key'
=>
''
,
'media_url'
=>
''
,
],
function
(
$items
){
$request
=
$items
;
if
(
$request
->
status
){
if
(
!
$request
->
media_url
||
!
$request
->
secret_key
){
throw
new
FormException
(
"参数缺失"
);
}
}
});
$id
=
MediaModel
::
updateMediaStatus
(
$request
,
$media_id
);
$id
=
MediaModel
::
updateMediaStatus
(
$request
,
$media_id
);
...
...
app/Model/MediaModel.php
View file @
540b6161
...
@@ -601,10 +601,18 @@ class MediaModel extends Eloquent
...
@@ -601,10 +601,18 @@ class MediaModel extends Eloquent
}
}
$data
=
[
$data
=
[
'status'
=>
$request
->
status
??
""
'status'
=>
$request
->
status
??
""
,
// 'description' => $request->description,
];
];
if
(
$request
->
status
==
1
){
LogModel
::
addlog
([
"media重新转码"
=>
json_encode
(
$media
)]);
if
(
$request
->
media_secret
!=
$media
[
'secret_key'
]){
$data
[
'secret_key'
]
=
$request
->
secret_key
;
$data
[
'media_url'
]
=
$request
->
media_url
;
}
}
$flag
=
MediaModel
::
where
(
"_id"
,
$media_id
)
->
update
(
$data
);
$flag
=
MediaModel
::
where
(
"_id"
,
$media_id
)
->
update
(
$data
);
if
(
!
$flag
){
if
(
!
$flag
){
throw
new
\Exception
(
"Status更新失败"
);
throw
new
\Exception
(
"Status更新失败"
);
...
...
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