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

app/Http/Controllers/V1/PostController.php

@@ -49,7 +49,7 @@ class PostController extends Controller
         $validator = Validator::make($request->all(), [
             'type' => ['required', Rule::in('image', 'video', 'html')],
             'img' => 'required|url',
-            'video' => 'required_if:type,video|string|url',
+            'video' => 'required_if:type,video|string',
             'topic_ids' => 'required|string|max:64',
             'title' => 'nullable|string|max:20',
             'content' => 'required|string|max:1000',

app/Repositories/PostRepositories.php

@@ -108,7 +108,9 @@ class PostRepositories
             return jsonError('图片违规，请修正哦');
         }
         $videoUrl = "";
+        $videoId = "";
         if(isset($request['video']) && $request['video']){
+            $videoId = $request['video'];
             for($i=0;$i<3;$i++){
                 $videoUrl = $this->aliYunVodService->getPlayUrlByVideoId($request['video']);
                 Log::debug('video-url:'.$videoUrl);
@@ -129,6 +131,7 @@ class PostRepositories
             'type' => $request['type'],
             'img' => $request['img'],
             'video' => $videoUrl,
+            'video_id' => $videoId,
             'topic_ids' => implode(',', $topicIds),
             'title' => isset($request['title'])? $request['title'] : '',
             'content' => $request['content'],