Skip to content

M
media-resource
Commit 857ea5b6 by 杨昕
Options

test

parent 58e20e4c
Pipeline #18749 passed with stages
in 1 minute 9 seconds
Showing with 84 additions and 61 deletions
app/Http/Controllers/Api/MediaController.php
......@@ -27,11 +27,12 @@ class MediaController extends Controller
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function media_list(Request $request){
public function media_list(Request $request)
{
$result = handler_drive(function () use ($request){
$result = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request,[
SrsHookValidate::srsHookCallback($request, [
'params' => 'required'
]);
......@@ -49,9 +50,10 @@ class MediaController extends Controller
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function play_url(Request $request,$media_id){
public function play_url(Request $request, $media_id)
{
$result = handler_drive(function () use ($request,$media_id){
$result = handler_drive(function () use ($request, $media_id) {
return MediaModel::playUrl($media_id);
});
......@@ -60,18 +62,18 @@ class MediaController extends Controller
}
/**
* 获取媒资列表
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function mediaListOnce(Request $request){
public function mediaListOnce(Request $request)
{
$res = handler_drive(function () use($request){
$res = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request,[
SrsHookValidate::srsHookCallback($request, [
'page' => 'integer',
'sort' => '',
'page_size' => 'integer',
......@@ -80,8 +82,8 @@ class MediaController extends Controller
'category_id' => ''
]);
if (!isset($request->category_id)){
$request->replace(array_merge($request->all(),['category_id'=>'5efa9cb5d16f5a214671fd86']));
if (!isset($request->category_id)) {
$request->replace(array_merge($request->all(), ['category_id' => '5efa9cb5d16f5a214671fd86']));
}
return MediaModel::mediaList($request);
......@@ -92,30 +94,31 @@ class MediaController extends Controller
}
public function test(Request $request){
public function test(Request $request)
{
$res = [];
for ($i = 0;$i<=5;$i++){
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');
$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);
$medias = json_decode($result, true);
if (isset($medias['data']['data']) && !empty($medias['data']['data'])){
if (isset($medias['data']['data']) && !empty($medias['data']['data'])) {
$data = $medias['data']['data'];
if (!empty($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){
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"]);
MediaModel::deleteMediaById($request, $media["_id"]);
}
......@@ -132,18 +135,16 @@ class MediaController extends Controller
}
/**
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function handleMediaUrl(Request $request){
public function handleMediaUrl(Request $request)
{
$res = handler_drive(function () use($request){
SrsHookValidate::srsHookCallback($request,[
$res = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request, [
'media_name' => '',
'username' => '',
'page' => 'integer',
......@@ -164,11 +165,12 @@ class MediaController extends Controller
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function hookRestoreMedia(Request $request){
public function hookRestoreMedia(Request $request)
{
$id = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request,array_merge([
SrsHookValidate::srsHookCallback($request, array_merge([
'media_name' => 'required',
'secret_key' => '',
'media_url' => 'required',
......@@ -183,21 +185,21 @@ class MediaController extends Controller
$params = array(
'media_id' => MediaModel::getMediaId(),
'media_type'=> '5efa9cb5d16f5a214671fd86',//默认，中公网校
'start_time'=> $data_time,
'media_type' => '5efa9cb5d16f5a214671fd86',//默认，中公网校
'start_time' => $data_time,
'end_time' => $data_time,
'access_key'=> '',
'description'=>$request->description??'',
'access_key' => '',
'description' => $request->description ?? '',
);
//shop_id为100时，代表的是北大学堂的视频
if ($request->shop_id=='100'){
if ($request->shop_id == '100') {
$catg = MediaCategoryModel::getCategoryByName("北大学堂");
$params['media_type'] = $catg['_id'];
}
$request->replace(array_merge($request->all(),$params));
$request->replace(array_merge($request->all(), $params));
$id = MediaModel::hookRestoreMedia($request);
......@@ -212,12 +214,13 @@ class MediaController extends Controller
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function updateMediaStatus(Request $request,$media_id){
public function updateMediaStatus(Request $request, $media_id)
{
$id = handler_drive(function () use ($request,$media_id) {
$id = handler_drive(function () use ($request, $media_id) {
SrsHookValidate::srsHookCallback($request,[
SrsHookValidate::srsHookCallback($request, [
'status' => '',
'secret_key' => '',
'media_url' => '',
......@@ -228,13 +231,13 @@ class MediaController extends Controller
'media_type' => '',
'shop_id' => '',
],function ($items){
], function ($items) {
$request = $items;
if ($request->status){
if ($request->status) {
if (!$request->media_url ){
if (!$request->media_url) {
throw new FormException("参数缺失");
}
}
......@@ -245,20 +248,20 @@ class MediaController extends Controller
* 设置开始时间与结束时间
*/
$params = array(
'media_type'=> '5efa9cb5d16f5a214671fd86',//默认，中公网校
'access_key'=> '',
'description'=>$request->description??'',
'media_type' => '5efa9cb5d16f5a214671fd86',//默认，中公网校
'access_key' => '',
'description' => $request->description ?? '',
);
if ($request->shop_id=='100'){
if ($request->shop_id == '100') {
$params['media_type'] = "5f3d073a033f5a336b2b4346";
}
$request->replace(array_merge($request->all(),$params));
$request->replace(array_merge($request->all(), $params));
LogModel::addlog(['media_id'=>$media_id,"更新媒资状态"=>json_encode($request->all())]);
$id = MediaModel::updateMediaStatus($request,$media_id);
LogModel::addlog(['media_id' => $media_id, "更新媒资状态" => json_encode($request->all())]);
$id = MediaModel::updateMediaStatus($request, $media_id);
return $id;
});
......@@ -272,7 +275,8 @@ class MediaController extends Controller
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function updateDatetime(Request $request){
public function updateDatetime(Request $request)
{
$id = handler_drive(function () use ($request) {
......@@ -290,7 +294,8 @@ class MediaController extends Controller
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function getMediaInfoByNum(Request $request){
public function getMediaInfoByNum(Request $request)
{
$data = handler_drive(function () use ($request) {
return MediaModel::getMediaInfoByNum($request);
......@@ -304,7 +309,8 @@ class MediaController extends Controller
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function getMediaForeverM3u8(Request $request){
public function getMediaForeverM3u8(Request $request)
{
$data = handler_drive(function () use ($request) {
return MediaModel::getMediaForeverM3u8($request);
......@@ -318,10 +324,11 @@ class MediaController extends Controller
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function getMediaListByMediaIds(Request $request){
public function getMediaListByMediaIds(Request $request)
{
$data = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request,[
SrsHookValidate::srsHookCallback($request, [
'media_ids' => 'required',
]);
return MediaModel::getMediaListByMediaIds($request);
......@@ -336,11 +343,25 @@ class MediaController extends Controller
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function getScreeShotInfo(Request $request, $id){
$data = handler_drive(function () use ($request,$id) {
return MediaModel::getScreeShotInfo($id);
public function getScreeShotInfo(Request $request)
{
$data = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request, [
'media_id' => 'required',
'secret_key' => '',
'media_url' => '',
]);
return array(
"media_id" => $request->media_id,
"secret_key" => $request->secret_key,
"media_url" => $request->media_url,
);
//return MediaModel::getScreeShotInfo($request);
});
return success($data);
}
}
app/Model/MediaModel.php
......@@ -273,7 +273,7 @@ class MediaModel extends Eloquent
$id = MediaModel::insertGetId($data);
//处理封面图片以及分辨率
self::getScreeShotInfo($media_id);
//self::getScreeShotInfo($media_id);
LogModel::addlog(["添加媒资信息"=> $data,['媒资ID为：=> '.$id]]);
}catch (\Exception $exception){
......@@ -364,7 +364,7 @@ class MediaModel extends Eloquent
throw new \Exception("更新失败");
}
//处理封面图片以及分辨率
self::getScreeShotInfo($id);
//self::getScreeShotInfo($id);
LogModel::addlog(["更新媒资信息=>".$id,$data]);
}catch (\Exception $exception){
......@@ -1085,7 +1085,7 @@ class MediaModel extends Eloquent
* @return mixed
* @throws DatabaseException
*/
public static function getScreeShotInfo($media_id){
public static function getScreeShotInfo($request){
try{
$media = MediaModel::select("_id","media_name","duration","secret_key","media_url")->where('_id',$media_id)->first();
......
routes/api.php
......@@ -53,5 +53,6 @@ Route::group(['namespace' => 'Api', 'prefix' => 'user','middleware' => ['api']],
Route::post("getMediaListByMediaIds","MediaController@getMediaListByMediaIds");
//Route::get("media_url_change","MediaController@handleMediaUrl");
Route::get("getScreeShotInfo/{id}","MediaController@getScreeShotInfo");
Route::post("screenShot","MediaController@getScreeShotInfo");
Route::post("screenShotCallback","MediaController@updateScreeShotInfo");
});
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment