Commit 540b6161 by 杨昕

更改第三方修改房间接口

parent 470846e3
Pipeline #10840 passed with stages
in 45 seconds
...@@ -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);
......
...@@ -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更新失败");
......
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