dever 6 rokov pred
rodič
commit
fd8e9acdac
3 zmenil súbory, kde vykonal 8 pridanie a 6 odobranie
  1. 1 1
      live/lib/Cron.php
  2. 5 3
      live/lib/Handle.php
  3. 2 2
      live/lib/Qiniu.php

+ 1 - 1
live/lib/Cron.php

@@ -44,7 +44,7 @@ class Cron
                     $config = Dever::db('live/info')->one($info['live_id']);
                     $handle = new Handle();
                     $method = $handle->method($config);
-                    $handle->createUrlOne($v, $video['table'], $method, $config, $info);
+                    $handle->createUrlOne($v, $video, $method, $config, $info);
                 }
             }
         }

+ 5 - 3
live/lib/Handle.php

@@ -71,7 +71,8 @@ class Handle
 
             try {
                 $data['url_m3u8'] = $config['host'] . $method->save($info['key'],$log['sdate'], $log['edate']);
-                $data['url_mp4'] = $config['host'] . $method->save($info['key'], $log['sdate'], $log['edate'], 'mp4');
+                //$data['url_mp4'] = $config['host'] . $method->save($info['key'], $log['sdate'], $log['edate'], 'mp4');
+                $data['url_mp4'] = '';
             } catch (\Exception $e) {
                 $data['url_m3u8'] = $data['url_mp4'] = '';
             }
@@ -112,7 +113,8 @@ class Handle
 
             try {
                 $url_m3u8 = $config['host'] . $method->save($info['key'],$data[$video['sdate']], $data[$video['edate']]);
-                $url_mp4 = $config['host'] . $method->save($info['key'], $data[$video['sdate']], $data[$video['edate']], 'mp4');
+                $url_mp4 = '';
+                //$url_mp4 = $config['host'] . $method->save($info['key'], $data[$video['sdate']], $data[$video['edate']], 'mp4');
             } catch (\Exception $e) {
                 $url_m3u8 = $url_mp4 = '';
             }
@@ -121,7 +123,7 @@ class Handle
                 return false;
             }
 
-            Dever::db($video['table'])->update(array('where_id' => $data['id'], $data[$video['url_m3u8']] => $url_m3u8, $data[$video['url_mp4']] => $url_mp4));
+            Dever::db($video['table'])->update(array('where_id' => $data['id'], $video['url_m3u8'] => $url_m3u8, $video['url_mp4'] => $url_mp4));
 
             return array('id' => $data['id'], 'm3u8' => $url_m3u8, 'mp4' => $url_mp4);
         }

+ 2 - 2
live/lib/Qiniu.php

@@ -90,8 +90,8 @@ class Qiniu
             $end = time();
         }
         if ($format) {
-            $format = array("format" => $format);
-            $data = $stream->saveas($format, $start, $end);
+            $option = array('format' => $format, 'start' => $start, 'end' => $end);
+            $data = $stream->saveas($option);
         } else {
             $data = $stream->save($start, $end);
         }