wupengfei 2 лет назад
Родитель
Сommit
b16433736d
3 измененных файлов с 7 добавлено и 3 удалено
  1. 3 2
      .idea/workspace.xml
  2. 1 1
      application/common.php
  3. 3 0
      application/nutrition/controller/VideoUrl.php

+ 3 - 2
.idea/workspace.xml

@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/ArticleItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/ArticleItem.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/VideoUrl.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoUrl.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -190,7 +191,7 @@
       <workItem from="1669429338320" duration="861000" />
       <workItem from="1669448616248" duration="5065000" />
       <workItem from="1669597148644" duration="17061000" />
-      <workItem from="1669682447842" duration="3522000" />
+      <workItem from="1669682447842" duration="4413000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/common.php

@@ -345,7 +345,7 @@ function getVideoTime($ali_id)
 {
     $res = (new \app\api\controller\VideoDemand())->getVideoInfo($ali_id);
     if(empty($res['videoBase'])) return ['duration'=>0 ,'duration_str'=>''];
-    return ['duration'=>intval($res['videoBase']['duration']) ,'duration_str'=>get_stay_time($res['videoBase']['duration'])];
+    return ['duration'=>intval($res['videoBase']['duration']) ,'duration_str'=>get_stay_time(intval($res['videoBase']['duration']))];
 
 }
 

+ 3 - 0
application/nutrition/controller/VideoUrl.php

@@ -139,6 +139,9 @@ class VideoUrl extends Controller
             }
             if(empty($data['cover'])) $this->error('请上传视频封面');
             if(empty($data['ali_vid'])) $this->error('云点播ID不能为空');
+            $vid_info = getVideoTime($data['ali_vid']);
+            $data['duration'] = $vid_info['duration'];
+            $data['duration_str'] = $vid_info['duration_str'];
             if(!empty($post['phone'])) {
                 $user_id = User::where('phone|email',$post['phone'])->value('id');
                 if(!$user_id) $this->error('账号未注册');