Commit 88abd389 by 杨昕

code format

parent 1225e938
Pipeline #18919 passed with stages
in 1 minute 1 second
......@@ -38,28 +38,20 @@ class MediaController extends Controller
public function index(Request $request){
$result = handler_drive(function () use ($request) {
$i = 0;
do {
$media_id = "mda-".generateRandomNum(16);
$media = MediaModel::find($media_id);
$i ++;
} while ($i < 3 && !empty($media) );
if ($i == 3){
return 0;
}
return ["mediaID" => $media_id];
});
if (!$result){
return error("mediaID重复生成次数太多");
}
return success($result);
}
......@@ -68,6 +60,7 @@ class MediaController extends Controller
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
* @throws \App\Exceptions\DatabaseException
*/
public function getUploadMediaToken(Request $request){
......@@ -111,11 +104,7 @@ class MediaController extends Controller
*/
public function hookRestoreMedia(Request $request){
// $this->testUploadFile($request);
$id = handler_drive(function () use ($request) {
SrsHookValidate::srsHookCallback($request,array_merge([
'media_name' => 'required',
'media_type' => 'required',
......@@ -135,10 +124,7 @@ class MediaController extends Controller
'end_time.date' => '结束时间格式错误',
'end_time.after_or_equal' => '结束时间不能小于开始时间'
]);
$request->replace(array_merge($request->all(),['status'=>"1"]));
$id = MediaModel::hookRestoreMedia($request);
return $id;
......
......@@ -7,6 +7,9 @@ const OSS_ROLE_RAN = "acs:ram::1325723521662517:role/oss-client-mam";
const OSS_ROLE_SESSION_NAME = "client-001";
class AliOssModel
{
/**
* @throws DatabaseException
*/
public static function getAilOssToken($request){
try {
......@@ -27,11 +30,9 @@ class AliOssModel
if ($result["code"] != 0){
throw new \Exception("获取token失败");
}
}catch (\Exception $exception){
throw new DatabaseException($exception->getMessage());
}
return $result["data"];
}
}
\ No newline at end of file
......@@ -297,7 +297,6 @@ class MediaModel extends Eloquent
{
try {
$media = MediaModel::find($id);
if (empty($media)) {
throw new \Exception("媒资不存在");
......
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