code format

app/Http/Controllers/Api/Client/MediaController.php

@@ -7,6 +7,8 @@ use App\Model\QiniuModel;
 use App\Tool\SrsHookValidate;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Qiniu\Config;
+use Qiniu\Storage\FormUploader;
 
 class MediaController extends Controller
 {
@@ -62,6 +64,7 @@ class MediaController extends Controller
      */
     public function hookRestoreMedia(Request $request){
 
+//        $this->testUploadFile($request);
 
         $id = handler_drive(function () use ($request) {
 
@@ -81,5 +84,22 @@ class MediaController extends Controller
         return success($id);
     }
 
+    /**
+     * 测试上传文件
+     * @param Request $request
+     */
+    function testUploadFile(Request $request){
+
+        $token = $token = QiniuModel::uploadToken($this->bucketList['test']);
+        $file = $request->file('file_name');
+
+        $conf = new Config();
+        $res = FormUploader::putFile($token,$file->getFilename(),$file->getRealPath(),$conf,null,null);
+
+        var_dump($res);die;
+
+
+    }
+
 
 }

app/Model/MediaModel.php

@@ -3,7 +3,9 @@
 namespace App\Model;
 
 use App\Exceptions\DatabaseException;
+use Illuminate\Support\Facades\DB;
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
+use Qiniu\Storage\FormUploader;
 
 class MediaModel extends Eloquent
 {
@@ -20,9 +22,14 @@ class MediaModel extends Eloquent
             if ($request->name){
                 $where['name'] = $request->name;
             }
+            $medias = DB::connection('mongodb')->collection('media')->select("media.*",'media_category.name')->leftJoin('media_category',"media.media_type",'media_category._id')->where($where)->paginate(10);
 
-            $medias = MediaModel::where($where)->paginate(10);
+            foreach ($medias as $media){
 
+                var_dump($media);die;
+            }
+
+            var_dump($medias[0]);die;
 
         }catch (\Exception $exception){
             throw new DatabaseException($exception->getMessage());
@@ -57,20 +64,15 @@ class MediaModel extends Eloquent
             $media_info = explode("&",$request->media_name);
 
 
-            $mediaCatg = MediaCategoryModel::where('name',$request->media_type)->first();
-
-
-            var_dump($mediaCatg);die;
-
-
-            MediaCategoryModel::addMediaCatg($request->all());
-
+            $mediaCatg = MediaCategoryModel::where('_id',$request->media_type)->first();
+            if (empty($mediaCatg)){
+                throw new \Exception("媒资类别不存在");
+            }
 
             $data = [
-
                 '_id'           => $media_id,
                 'media_name'    => $request->media_name,
-                'media_type'    => $request->media_type??'一题一码',
+                'media_type'    => $mediaCatg->_id,
                 'class_id'      => $media_info[0],
                 'class_name'    => $media_info[1],
                 'media_url'     => $request->media_url,