Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/community-service into develop

app/Http/Controllers/V1/AliYunVodController.php

@@ -9,6 +9,7 @@
 namespace App\Http\Controllers\V1;
 
 
+use App\Repositories\FeedRepositories;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
@@ -19,11 +20,15 @@ use ShaoZeMing\Aliyun\Core\Profile\DefaultProfile;
 
 class AliYunVodController extends Controller
 {
-    public function __construct()
+    public function __construct(FeedRepositories $feedRepositories)
     {
-
+        $this->feedRepositories = $feedRepositories;
     }
 
+    public function test(){
+        $abc = $this->feedRepositories->test();
+        var_dump($abc);
+    }
     /**
      * 获取视频上传凭证信息
      * @param Request $request
@@ -36,8 +41,7 @@ class AliYunVodController extends Controller
         $request = $request->all();
         $validator = Validator::make($request, [
             'title' => 'required',
-            'filename' => 'required',
-            'cover_url' => 'url'
+            'filename' => 'required'
         ]);
         if ($validator->fails()) {
             return jsonError($validator->errors()->first());
@@ -45,7 +49,7 @@ class AliYunVodController extends Controller
         $instance = new UploadService(config('aliyunvod'));
         $title = $request['title'];
         $filename = $request['filename'];
-        $coverUrl = isset($request['cover_url']) ?: $request['cover_url'];
+        $coverUrl = isset($request['cover_url']) ?$request['cover_url']:'';
         try {
             $result = $instance->createUploadVideo($title, $filename, '', $coverUrl);  //获取视频上传地址和凭证
 //            $result = $instance->refreshUploadVideo($videoId);  //刷新视频上传凭证

app/Http/Controllers/V1/PostController.php

@@ -140,7 +140,8 @@ class PostController extends Controller
         }else{
             $uid = $userInfo['uid'];
         }
-        $list = $this->postRepositories->myPost($request['type'], $uid);
+
+        $list = $this->postRepositories->myPost($param, $uid);
         $fractal = new Manager();
         $resource = new Collection($list, new MyTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($list));

app/Repositories/FeedRepositories.php

@@ -180,4 +180,10 @@ class FeedRepositories
     public function getPostComment($post_id){
        return $this->postComment->where(['post_id'=>$post_id,'parent_id'=>0,'is_delete'=>0  ])->select('id','uid','username','content')->orderBy('id','desc')->take(2)->get();
     }
+
+    public function test(){
+        $a = 2222;
+        return jsonSuccess();
+        echo $a;
+    }
 }

app/Repositories/PostRepositories.php

@@ -303,8 +303,9 @@ class PostRepositories
     /**
      * 个人中心内容列表
      */
-    public function MyPost($type, $uid)
+    public function MyPost($request, $uid)
     {
+        $type = $request['type'];
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
 
         $where = [];

routes/api.php

@@ -22,6 +22,7 @@ $api->version('v1', [
     $api->get('getPlayUrlByVideoId', 'AliYunVodController@getPlayUrlByVideoId');
     //获取所有行为
     $api->get('getAllBehavior', 'BehaviorController@getAllBehavior');
+    $api->get('test_aa', 'AliYunVodController@test');
     //登录+验签
     $api->group(['middleware' => ['chxq_jwt_auth']], function ($api) {
         //发布内容