Commit 29159581 by 杨昕

test

parent d4605eef
Pipeline #9789 passed with stages
in 32 seconds
...@@ -62,11 +62,15 @@ class Handler extends ExceptionHandler ...@@ -62,11 +62,15 @@ class Handler extends ExceptionHandler
&& ($exception instanceof \Symfony\Component\HttpKernel\Exception\NotFoundHttpException) ) { && ($exception instanceof \Symfony\Component\HttpKernel\Exception\NotFoundHttpException) ) {
return error('resources not found',\Symfony\Component\HttpFoundation\Response::HTTP_NOT_FOUND); return error('resources not found',\Symfony\Component\HttpFoundation\Response::HTTP_NOT_FOUND);
} }
if( ( (stripos($path,'web/') === 0 && strrpos($path,'.php') !== false) || (stripos($path,'web/') === 0 && strrpos($path,'.html') !== false ) ) && ($exception instanceof \Symfony\Component\HttpKernel\Exception\NotFoundHttpException) ) { if( ( (stripos($path,'web/') === 0 && strrpos($path,'.php') !== false) || (stripos($path,'web/') === 0 && strrpos($path,'.html') !== false ) ) && ($exception instanceof \Symfony\Component\HttpKernel\Exception\NotFoundHttpException) ) {
echo 555;die;
if (view()->exists('errors.404')) { if (view()->exists('errors.404')) {
return response()->view('errors.404'); return response()->view('errors.404');
} }
} }
if (self::handlerException($exception)) { if (self::handlerException($exception)) {
# 获取常量类里面的异常常量 # 获取常量类里面的异常常量
$message = json_decode($exception->getMessage(),true); $message = json_decode($exception->getMessage(),true);
...@@ -81,14 +85,17 @@ class Handler extends ExceptionHandler ...@@ -81,14 +85,17 @@ class Handler extends ExceptionHandler
} }
} }
if ($request->is('api/*')) { if ($request->is('api/*')) {
return error('服务器请求异常:'.$exception->getMessage()."异常信息详情:".$exception->getTraceAsString(),500); return error('服务器请求异常:'.$exception->getMessage()."异常信息详情:".$exception->getTraceAsString(),500);
} else { } else {
if ($exception->getMessage() != '') { if ($exception->getMessage() != '') {
//print_r($exception->getMessage()); //print_r($exception->getMessage());
if ($exception->getMessage() == 403) { if ($exception->getMessage() == 403) {
return response()->view('errors.403'); return response()->view('errors.403');
} }
return response()->view('errors.404'); return response()->view('errors.404');
} }
#return response()->json(['code'=>403, 'msg'=>'您没有权限']); #return response()->json(['code'=>403, 'msg'=>'您没有权限']);
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
namespace App\Http\Controllers\Api\Client; namespace App\Http\Controllers\Api\Client;
use App\Model\MediaModel;
use App\Model\QiniuModel; use App\Model\QiniuModel;
use App\Tool\SrsHookValidate;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Qiniu\Auth;
class MediaController extends Controller class MediaController extends Controller
{ {
private $bucketList = [ private $bucketList = [
...@@ -41,17 +41,43 @@ class MediaController extends Controller ...@@ -41,17 +41,43 @@ class MediaController extends Controller
$result = handler_drive(function () use ($request) { $result = handler_drive(function () use ($request) {
$branch = empty(getenv('branch')) ? 'test' : getenv('branch'); $branch = empty(getenv('branch')) ? 'test' : getenv('branch');
$token = QiniuModel::uploadToken($this->bucketList[$branch]); SrsHookValidate::srsHookCallback($request,[
'key' => ''
]);
$key = $request->key??'';
$token = QiniuModel::uploadToken($this->bucketList[$branch],$key);
return ["token" => $token]; return ["token" => $token];
}); });
return success($result); return success($result);
} }
public function hookRestoreMedia(Request $request){
$id = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request,[
'media_name' => 'required',
'media_type' => 'required',
'media_id' => 'required',
'access_key' => '',
'secret_key' => '',
'media_url' => 'required',
]);
$id = MediaModel::hookRestoreMedia($request);
return $id;
});
return success($id);
}
public function uploadMedia(Request $request){
}
} }
<?php
namespace App\Http\Controllers\Api;
use App\Model\QiniuModel;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Qiniu\Auth;
class MediaController extends Controller
{
private $bucketList = [
'develop' => 'dev-offcncloud',
'test' => 'test-offcncloud',
'master' => 'offcncloud',
];
/**
* 获取媒资ID
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public function index(Request $request){
$result = handler_drive(function () use ($request) {
return ["mediaID" => 'mda-'.generateRandomNum(16)];
});
return success($result);
}
public function mediaIdList(){
}
}
...@@ -8,7 +8,7 @@ use App\Http\Controllers\Controller; ...@@ -8,7 +8,7 @@ use App\Http\Controllers\Controller;
class MediaController extends Controller class MediaController extends Controller
{ {
public static function index(Request $request){ public function index(Request $request){
$medias = MediaModel::mediaList($request); $medias = MediaModel::mediaList($request);
...@@ -23,5 +23,14 @@ class MediaController extends Controller ...@@ -23,5 +23,14 @@ class MediaController extends Controller
} }
public function edit(Request $request){
}
} }
...@@ -24,43 +24,67 @@ class MediaModel extends Eloquent ...@@ -24,43 +24,67 @@ class MediaModel extends Eloquent
$where['name'] = $request->name; $where['name'] = $request->name;
} }
$medias = DB::connection('mongodb')->collection('media')
->where($where)
->paginate(10);
}catch (\Exception $exception){
throw new DatabaseException($exception->getMessage());
}
// MediaModel::insertGetId([ return $medias;
//
// "_id" => 'mda-'.generateRandomNum(16),
// "url" => 'http://www.baidu.com',
// "QR_code"=> 'test',
// 'video_url'=>"http://www.sfdjlsdjflsaj,coanldsfjsalj.sdafljasdofjasp",
// "create_time" => date("Y-m-d H:i:s",time())
//
// ]);
//
// var_dump("fsd");die;
}
/**
* 存储媒资数据
* @param $request
* @return mixed
* @throws DatabaseException
*/
public static function hookRestoreMedia($request){
try{
/**
* 判断媒资ID是否存在
*/
$media_id = $request->media_id;
$media = MediaModel::find($media_id);
if ($media){
throw new \Exception('媒资已经存在');
}
//hb15011&河北公务员考试试题
/**
* 媒资名称是由课程编号与课程名称组成
*/
$media_info = explode("&",$request->media_name);
$medias = DB::connection('mongodb')->collection('media')
->where($where)
->paginate(10);
// foreach ( $medias as &$user){ $data = [
// $idArr = ($user['_id'])->jsonSerialize();
// $user['_id'] = $idArr['$oid']; '_id' => $media_id,
// } 'media_name' => $request->media_name,
'media_type' => $request->media_type??'一题一码',
'class_id' => $media_info[0],
'class_name' => $media_info[1],
'media_url' => $request->media_url,
'access_key' => $request->access_key,
'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time())
];
$id = MediaModel::insertGetId($data);
}catch (\Exception $exception){ }catch (\Exception $exception){
throw new DatabaseException($exception->getMessage()); throw new DatabaseException($exception->getMessage());
} }
return $medias; return $id;
} }
} }
...@@ -11,7 +11,7 @@ namespace App\Model; ...@@ -11,7 +11,7 @@ namespace App\Model;
final class QiniuModel final class QiniuModel
{ {
private static $accessKey = "5ClMHcAd5KN6oN6SC7ni7uuwOOpaSvoDRMHR_3l8"; private static $accessKey = "5ClMHcAd5KN6oN6SC7ni7uuwOOpaSvoDRMHR_3l8";
private static $secretKey = "saqgin-1cokqa-gipbIv"; private static $secretKey = "xoJZ_3crOqMOsznLU8lbjlNU8pXJwEq5-n5vd3Fv";
// public function __construct($accessKey, $secretKey) // public function __construct($accessKey, $secretKey)
// { // {
......
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
<th>序号</th> <th>序号</th>
<th>媒资编号</th> <th>媒资编号</th>
<th>视频地址</th> <th>视频地址</th>
<th>二维码</th>
<th>创建时间</th> <th>创建时间</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
...@@ -67,8 +66,7 @@ ...@@ -67,8 +66,7 @@
<tr class="<?php if($key%2==0) echo 'table-success';?>"> <tr class="<?php if($key%2==0) echo 'table-success';?>">
<td>{{$key+1}}</td> <td>{{$key+1}}</td>
<td style="max-width: 150px;">{{$media['_id']}}</td> <td style="max-width: 150px;">{{$media['_id']}}</td>
<td style="max-width: 300px;">{{$media['video_url']}}</td> <td style="max-width: 300px;">{{$media['media_url']}}</td>
<td>{{$media['QR_code']}}</td>
<td style="max-width: 100px;">{{$media['create_time']}}</td> <td style="max-width: 100px;">{{$media['create_time']}}</td>
<td class="td-manage"> <td class="td-manage">
......
...@@ -26,6 +26,16 @@ Route::group(['namespace' => 'Api', 'prefix' => 'v1', 'middleware' => ['auth']], ...@@ -26,6 +26,16 @@ Route::group(['namespace' => 'Api', 'prefix' => 'v1', 'middleware' => ['auth']],
Route::get('media_catg', 'Client\MediaCategoryController@index'); Route::get('media_catg', 'Client\MediaCategoryController@index');
Route::get('generate_media_id', 'Client\MediaController@index'); Route::get('generate_media_id', 'Client\MediaController@index');
Route::get('upload_token', 'Client\MediaController@getUploadMediaToken'); Route::get('upload_token', 'Client\MediaController@getUploadMediaToken');
Route::post('hook_restore', 'Client\MediaController@hookRestoreMedia');
}); });
Route::group(['namespace' => 'Api', 'prefix' => 'v1', 'middleware' => ['auth']], function () {
});
\ 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