rabin 7 年之前
父节点
当前提交
33f66ce881
共有 5 个文件被更改,包括 39 次插入3 次删除
  1. 1 1
      content/database/course.php
  2. 12 0
      content/database/meeting.php
  3. 6 1
      content/lib/Base.php
  4. 9 0
      content/v1/Meeting.php
  5. 11 1
      content/v1/Video.php

+ 1 - 1
content/database/course.php

@@ -92,7 +92,7 @@ return array
 			'match' 	=> 'is_string',
 			'update'	=> 'textarea',
 			//'search'	=> 'fulltext',
-			//'list'		=> true,
+			'list'		=> 'Dever::load("content/v1/video.html", "{video}")',
 		),
 
 		'audio'		=> array

+ 12 - 0
content/database/meeting.php

@@ -138,6 +138,18 @@ return array
 			'list'		=> 'date("Y-m-d H:i:s", {cdate})',
 			'callback'	=> 'maketime',
 		),
+
+		'num'		=> array
+		(
+			'type' 		=> 'varchar-80',
+			'name' 		=> '参会人数',
+			'default' 	=> '',
+			'desc' 		=> '请输入参会人数',
+			'match' 	=> 'option',
+			'update'	=> 'text',
+			//'search'	=> 'fulltext',
+			'list'		=> true,
+		),
 		
 		'content'		=> array
 		(

+ 6 - 1
content/lib/Base.php

@@ -72,7 +72,12 @@ class Base
         if (isset($data['pic']) && $data['pic']) {
             $data['pic'] = explode(',', $data['pic']);
         }
-        
+        if (isset($data['sdate']) && $data['sdate']) {
+            $data['sdate'] = date('Y年m月d日', $data['sdate']);
+        }
+        if (isset($data['edate']) && $data['edate']) {
+            $data['edate'] = date('Y年m月d日', $data['edate']);
+        }
         $data['cdate'] = Dever::mdate($data['cdate'], 2);
         if (isset($data['author_id'])) {
             $data['author'] = $this->handlePic(Dever::load('set/author-one', $data['author_id']));

+ 9 - 0
content/v1/Meeting.php

@@ -28,6 +28,9 @@ class Meeting extends Base
      * @apiSuccess {Object[]} focus 正在进行的听课信息
      * @apiSuccess {Number}   focus.id  正在进行的听课id
      * @apiSuccess {String}   focus.name  正在进行的听课标题
+     * @apiSuccess {String}   focus.num  听课人数
+     * @apiSuccess {String}   focus.sdate  听课开始时间
+     * @apiSuccess {String}   focus.edate  听课结束时间
      * @apiSuccess {String}   focus.content  正在进行的听课内容
      * @apiSuccess {String}   focus.num_view  正在进行的阅读数
      * @apiSuccess {String}   focus.cdate  时间
@@ -35,6 +38,9 @@ class Meeting extends Base
      * @apiSuccess {Object[]} meeting 听课信息
      * @apiSuccess {Number}   meeting.id  听课id
      * @apiSuccess {String}   meeting.name  听课标题
+     * @apiSuccess {String}   meeting.num  听课人数
+     * @apiSuccess {String}   meeting.sdate  听课开始时间
+     * @apiSuccess {String}   meeting.edate  听课结束时间
      * @apiSuccess {String}   meeting.content  听课内容
      * @apiSuccess {String}   meeting.num_view  阅读数
      * @apiSuccess {String}   meeting.cdate  时间
@@ -91,6 +97,9 @@ class Meeting extends Base
      * @apiSuccess {Object[]} meeting 听课信息
      * @apiSuccess {Number}   meeting.id  听课id
      * @apiSuccess {String}   meeting.name  听课标题
+     * @apiSuccess {String}   meeting.num  听课人数
+     * @apiSuccess {String}   meeting.sdate  听课开始时间
+     * @apiSuccess {String}   meeting.edate  听课结束时间
      * @apiSuccess {String}   meeting.content  听课内容
      * @apiSuccess {String}   meeting.num_view  阅读数
      * @apiSuccess {String}   meeting.cdate  时间

+ 11 - 1
content/v1/Video.php

@@ -6,6 +6,16 @@ use Dever;
 
 class Video
 {
+    # 从腾讯视频中解析mp4
+    public function html_api($link)
+    {
+        $link = $this->mp4_api($link);
+
+        $html = '<video controls="controls" width="200" src="'.$link.'">您的浏览器不支持视频播放</video>';
+
+        return $html;
+
+    }
     # 从腾讯视频中解析mp4
     public function mp4_api($link)
     {
@@ -35,5 +45,5 @@ class Video
         return $link;
     }
 
-    //docker run jrottenberg/ffmpeg -i http://125.39.7.23/vhot2.qqvideo.tc.qq.com/ABeZbme1SX8-pYwYN_hPTYHdjJsGJiLeTu6P2YfrUsto/j0515xuxz37.m701.mp4?vkey=3EA0D99319B7D7F439F387E804AE9C87C631D0AA8EEE639266754BF3CE14AD55F79CD0239AF29518DBAF415259976CE4767E1615F80CA41B1B12F67067E8A480A95EFD4A6B06767092DFA7252AE16CEE6AC09EBEE4525F423B840B128A7F6522902C1FA8BFC48D0D -stats $ffmpeg_options  - > out.mp4
+    //docker run opencoconut/ffmpeg -i http://125.39.7.23/vhot2.qqvideo.tc.qq.com/ABeZbme1SX8-pYwYN_hPTYHdjJsGJiLeTu6P2YfrUsto/j0515xuxz37.m701.mp4?vkey=3EA0D99319B7D7F439F387E804AE9C87C631D0AA8EEE639266754BF3CE14AD55F79CD0239AF29518DBAF415259976CE4767E1615F80CA41B1B12F67067E8A480A95EFD4A6B06767092DFA7252AE16CEE6AC09EBEE4525F423B840B128A7F6522902C1FA8BFC48D0D -f webm -c:v libvpx -c:a libvorbis - > test.webm
 }