Commit 9cb45572 by 杨昕

优化代码

parent b9674722
Pipeline #10494 passed with stages
in 46 seconds
...@@ -182,27 +182,5 @@ class MediaController extends Controller ...@@ -182,27 +182,5 @@ class MediaController extends Controller
} }
/**
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function handleMediaUrl(Request $request){
$res = handler_drive(function () use($request){
SrsHookValidate::srsHookCallback($request,[
'media_name' => '',
'username' => '',
'page' => 'integer',
'media_id' => '',
'description' => '',
'sort' => '',
'page_size' => 'integer',
]);
return MediaModel::handleMediaUrl($request);
});
return success($res);
}
} }
...@@ -78,6 +78,28 @@ class MediaController extends Controller ...@@ -78,6 +78,28 @@ class MediaController extends Controller
} }
/**
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function handleMediaUrl(Request $request){
$res = handler_drive(function () use($request){
SrsHookValidate::srsHookCallback($request,[
'media_name' => '',
'username' => '',
'page' => 'integer',
'media_id' => '',
'description' => '',
'sort' => '',
'page_size' => 'integer',
]);
return MediaModel::handleMediaUrl($request);
});
return success($res);
}
......
...@@ -18,6 +18,7 @@ class MediaController extends Controller ...@@ -18,6 +18,7 @@ class MediaController extends Controller
* @throws \App\Exceptions\FormException * @throws \App\Exceptions\FormException
*/ */
public function index(Request $request){ public function index(Request $request){
// php 特殊字符转义,实现字符串安全存入数据库, // php 特殊字符转义,实现字符串安全存入数据库,
SrsHookValidate::srsHookCallback($request,[ SrsHookValidate::srsHookCallback($request,[
......
...@@ -451,9 +451,7 @@ class MediaModel extends Eloquent ...@@ -451,9 +451,7 @@ class MediaModel extends Eloquent
$aggregate[]['$match']['_id'] = $request->media_id; $aggregate[]['$match']['_id'] = $request->media_id;
} }
if (isset($request->media_name) && !empty($request->media_name)){ $aggregate[]['$match']['media_url'] = ['$regex' => 'qcoenfz67.bkt.clouddn.com' ];
$aggregate[]['$match']['media_url'] = ['$regex' => 'http://qcoenfz67.bkt.clouddn.com' ];
}
if (isset($request->username) && !empty($request->username)){ if (isset($request->username) && !empty($request->username)){
$aggregate[]['$match']['username'] = $request->username; $aggregate[]['$match']['username'] = $request->username;
...@@ -475,8 +473,7 @@ class MediaModel extends Eloquent ...@@ -475,8 +473,7 @@ class MediaModel extends Eloquent
}else{ }else{
$count = 0; $count = 0;
} }
//
//$count = sizeof($collection->aggregate($aggregate)->toArray()); //$count = sizeof($collection->aggregate($aggregate)->toArray());
...@@ -495,6 +492,7 @@ class MediaModel extends Eloquent ...@@ -495,6 +492,7 @@ class MediaModel extends Eloquent
}); });
if (!empty($medias)){ if (!empty($medias)){
......
...@@ -49,7 +49,7 @@ Route::group(['namespace' => 'Api', 'prefix' => 'user'], function () { ...@@ -49,7 +49,7 @@ Route::group(['namespace' => 'Api', 'prefix' => 'user'], function () {
// Route::get("media_url_change","Client\MediaController@handleMediaUrl"); Route::get("media_url_change","MediaController@handleMediaUrl");
}); });
\ 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