edit

act/database/comment.php

@@ -1,10 +1,7 @@
 <?php
 
-$table = array
-(
-	1 => '图文',
-	2 => '视频',
-);
+$table = Dever::config('base')->type;
+
 return array
 (
 	# 表名
@@ -37,7 +34,7 @@ return array
 			'match' 	=> 'is_numeric',
 			//'update'	=> 'select',
 			//'search'	=> 'select',
-			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#name", {uid}) : "匿名用户"',
+			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#username", {uid}) : "匿名用户"',
 		),
 
 		'source_table' 		=> array
@@ -58,7 +55,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '标题',
 			'match' 	=> 'option',
-			//'list'		=> 'Dever::load("set/manage.load", "{source_table}", {source_id})',
+			'list'		=> 'Dever::load("act/lib/manage.load", "{source_table}", {source_id})',
 		),
 		
 		'content'		=> array
@@ -87,7 +84,7 @@ return array
 		'cdate'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '录入时间',
+			'name' 		=> '评论时间',
 			'match' 	=> array('is_numeric', time()),
 			'desc' 		=> '',
 			# 只有insert时才生效

act/database/like.php

@@ -1,10 +1,6 @@
 <?php
 
-$table = array
-(
-	1 => '图文',
-	2 => '视频',
-);
+$table = Dever::config('base')->type;
 return array
 (
 	# 表名
@@ -37,7 +33,7 @@ return array
 			'match' 	=> 'is_numeric',
 			//'update'	=> 'select',
 			//'search'	=> 'select',
-			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#name", {uid}) : "匿名用户"',
+			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#username", {uid}) : "匿名用户"',
 		),
 
 		'source_table' 		=> array
@@ -58,7 +54,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '标题',
 			'match' 	=> 'option',
-			//'list'		=> 'Dever::load("set/manage.load", "{source_table}", {source_id})',
+			'list'		=> 'Dever::load("act/lib/manage.load", "{source_table}", {source_id})',
 		),
 		
 		'content'		=> array
@@ -87,7 +83,7 @@ return array
 		'cdate'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '录入时间',
+			'name' 		=> '喜欢时间',
 			'match' 	=> array('is_numeric', time()),
 			'desc' 		=> '',
 			# 只有insert时才生效
@@ -101,5 +97,6 @@ return array
 	(
 		'insert' => false,
 		'edit' => false,
+		'delete' => false,
 	),
 );

act/database/live_comment.php

@@ -1,10 +1,9 @@
 <?php
 
-$table = array
-(
-	1 => '图文',
-	2 => '视频',
-);
+$table = Dever::config('base')->type;
+unset($table[1]);
+unset($table[2]);
+unset($table[4]);
 return array
 (
 	# 表名
@@ -37,7 +36,7 @@ return array
 			'match' 	=> 'is_numeric',
 			//'update'	=> 'select',
 			//'search'	=> 'select',
-			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#name", {uid}) : "匿名用户"',
+			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#username", {uid}) : "匿名用户"',
 		),
 
 		'source_table' 		=> array
@@ -58,7 +57,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '标题',
 			'match' 	=> 'option',
-			//'list'		=> 'Dever::load("set/manage.load", "{source_table}", {source_id})',
+			'list'		=> 'Dever::load("act/lib/manage.load", "{source_table}", {source_id})',
 		),
 		
 		'content'		=> array
@@ -87,7 +86,7 @@ return array
 		'cdate'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '录入时间',
+			'name' 		=> '评论时间',
 			'match' 	=> array('is_numeric', time()),
 			'desc' 		=> '',
 			# 只有insert时才生效

act/database/share.php

@@ -1,10 +1,6 @@
 <?php
 
-$table = array
-(
-	1 => '图文',
-	2 => '视频',
-);
+$table = Dever::config('base')->type;
 return array
 (
 	# 表名
@@ -37,7 +33,7 @@ return array
 			'match' 	=> 'is_numeric',
 			//'update'	=> 'select',
 			//'search'	=> 'select',
-			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#name", {uid}) : "匿名用户"',
+			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#username", {uid}) : "匿名用户"',
 		),
 
 		'source_table' 		=> array
@@ -58,7 +54,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '标题',
 			'match' 	=> 'option',
-			//'list'		=> 'Dever::load("set/manage.load", "{source_table}", {source_id})',
+			'list'		=> 'Dever::load("act/lib/manage.load", "{source_table}", {source_id})',
 		),
 		
 		'content'		=> array
@@ -87,7 +83,7 @@ return array
 		'cdate'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '录入时间',
+			'name' 		=> '分享时间',
 			'match' 	=> array('is_numeric', time()),
 			'desc' 		=> '',
 			# 只有insert时才生效
@@ -101,5 +97,11 @@ return array
 	(
 		'insert' => false,
 		'edit' => false,
+		'delete' => false,
+
+		'list_button' => array
+		(
+			'list' => array('回流', '"share_reflux&search_option_share_id={id}&oper_parent=share"'),
+		),
 	),
 );

act/database/share_reflux.php

@@ -0,0 +1,129 @@
+<?php
+
+$table = Dever::config('base')->type;
+
+return array
+(
+    # 表名
+    'name' => 'share_reflux',
+    # 显示给用户看的名称
+    'lang' => '分享回流',
+    # 是否显示在后台菜单
+    'order' => 60,
+    'menu' => false,
+    # 数据结构
+    'struct' => array
+    (
+        'id'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => 'ID',
+            'default'   => '',
+            'desc'      => '',
+            'match'     => 'is_numeric',
+            'order'     => 'desc',
+            //'list'        => true,
+        ),
+        
+
+        'source_uid'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => '分享者',
+            'default'   => '',
+            'desc'      => '分享者',
+            'match'     => 'option',
+            'list'      => '{source_uid} > 0 ? Dever::load("passport/user-one#username", {source_uid}) : "匿名用户"',
+        ),
+
+
+        'source_table'      => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '类别',
+            'default'   => '',
+            'desc'      => '类别',
+            'match'     => 'option',
+            'option'    => $table,
+            'list'      => true,
+        ),
+        
+        'source_id'         => array
+        (
+            'type'      => 'int-11',
+            'name'      => '标题',
+            'default'   => '',
+            'desc'      => '标题',
+            'match'     => 'option',
+            'list'      => 'Dever::load("act/lib/manage.load", "{source_table}", {source_id})',
+        ),
+        
+
+        'uid'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '回流用户',
+            'default'   => '0',
+            'desc'      => '请选择用户',
+            'match'     => 'is_numeric',
+            //'update'  => 'select',
+            //'search'  => 'select',
+            'list'      => '{uid} > 0 ? Dever::load("passport/user-one#username", {uid}) : "匿名用户"',
+        ),
+
+        'gid'       => array
+        (
+            'type'      => 'varchar-80',
+            'name'      => '群组id',
+            'default'   => '',
+            'desc'      => '群组id',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            'search'    => 'fulltext',
+            //'list'        => true,
+        ),
+
+        'share_id'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '分享id',
+            'default'   => '',
+            'desc'      => '分享id',
+            'match'     => 'option',
+        ),
+        
+        'state'     => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '状态',
+            'default'   => '1',
+            'desc'      => '请选择状态',
+            'match'     => 'is_numeric',
+        ),
+        
+        'cdate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '录入时间',
+            'match'     => array('is_numeric', time()),
+            'desc'      => '',
+            # 只有insert时才生效
+            'insert'    => true,
+            'search'    => 'date',
+            'list'      => 'date("Y-m-d H:i:s", {cdate})',
+        ),
+    ),
+
+    'manage' => array
+    (
+        'insert' => false,
+        'edit' => false,
+        'delete' => false,
+    ),
+
+    # request 请求接口定义
+    'request' => array
+    (
+        
+    ),
+);

act/lib/Manage.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Act\Lib;
+
+use Dever;
+
+class Manage
+{
+    //{source_id} > 0 ? ("{name}" ? "{name}" : Dever::load("sad/supply-one#name", {source_id})) : "{name}"
+    public function load($source_table, $id)
+    {
+        $table = Dever::config('base')->type_table[$source_table];
+        $data = Dever::db($table)->one($id);
+
+        if ($data && $data['name']) {
+            return $data['name'];
+        }
+        return '未知';
+    }
+}

content/database/article.php

@@ -73,6 +73,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '',
 			'match' 	=> 'is_numeric',
+			'list'		=> true,
 		),
 		
 		'name'		=> array

journal/database/info.php

@@ -40,6 +40,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '',
 			'match' 	=> 'is_numeric',
+			'list'		=> true,
 		),
 
 		'name'		=> array
@@ -271,6 +272,23 @@ return array
 	# request 请求接口定义
 	'request' => array
 	(
+
+		'search' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'ids' => array('yes-id', 'in'),
+				//'cate_id' => 'yes',
+				'name' => array('yes', 'like'),
+				'id' => 'yes',
+			),
+			'type' => 'all',
+			'order' => array('reorder' => 'desc', 'id' => 'desc'),
+			'limit' => '0,1000',
+			'col' => 'name as name, id, id as value, "" as selected, "" as disabled',
+		),
+
 		'getAll' => array
 		(
 			# 匹配的正则或函数 选填项

journal/lib/Manage.php

@@ -59,6 +59,12 @@ class Manage
         return $this->search('video/live');
     }
 
+    # 搜索小刊
+    public function search_journal_api()
+    {
+        return $this->search('journal/info');
+    }
+
     # 显示杂志内页
     public function journalContent()
     {

live/database/stream.php

@@ -18,6 +18,12 @@ $status = array
     3 => '已结束',
 );
 
+$disabled = array
+(
+    1 => '启动',
+    2 => '禁播',
+);
+
 return array
 (
     # 表名
@@ -25,6 +31,13 @@ return array
     # 显示给用户看的名称
     'lang' => '直播流管理',
     'order' => 2,
+    'end' => array
+    (
+        //'update' => 'live/lib/manage.createStream',
+        'insert' => 'live/lib/manage.createStream',
+
+        'update_disabled' => 'live/lib/manage.updateDisabled',
+    ),
     # 数据结构
     'struct' => array
     (
@@ -50,7 +63,7 @@ return array
             'update'    => 'select',
             'option'    => $live,
             'search'    => 'select',
-            'list'      => true,
+            //'list'      => true,
         ),
 
         'name'      => array
@@ -61,7 +74,33 @@ return array
             'desc'      => '名称',
             'match'     => 'option',
             'update'    => 'text',
-            'list'      => true,
+            'search'    => 'fulltext',
+            'list_name' => '流信息',
+            'list'      => 'Dever::load("live/lib/manage.liveData", {id})',
+        ),
+
+        'key'      => array
+        (
+            'type'      => 'varchar-300',
+            'name'      => '流标识-流标识在直播空间中唯一，可包含 字母、数字、中划线、下划线；1 ~ 200 个字符长，对应云上的流名称。
+',
+            'default'   => '',
+            'desc'      => '流标识',
+            'match'     => 'option',
+            'search'    => 'fulltext',
+            'update'    => 'text',
+            //'list'      => true,
+        ),
+
+        'times'      => array
+        (
+            'type'      => 'varchar-30',
+            'name'      => '直播时长-直接输入小时数，默认为1个小时',
+            'default'   => '1',
+            'desc'      => '直播时长',
+            'match'     => 'option',
+            'update'    => 'text',
+            //'list'      => true,
         ),
 
         'status'       => array
@@ -74,10 +113,10 @@ return array
             //'update'    => 'select',
             'option'    => $status,
             'search'    => 'select',
-            'list'      => true,
+            //'list'      => true,
         ),
 
-        'link'      => array
+        'live'      => array
         (
             'type'      => 'varchar-800',
             'name'      => '推流地址',
@@ -85,7 +124,52 @@ return array
             'desc'      => '推流地址',
             'match'     => 'option',
             //'update'    => 'text',
-            'list'      => true,
+            'list_name'      => '直播地址',
+            'list'      => 'Dever::load("live/lib/manage.live", {id})',
+        ),
+
+        'url_rtmp'      => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '高清地址',
+            'default'   => '',
+            'desc'      => '直播地址',
+            'match'     => 'option',
+            //'update'    => 'text',
+            //'list'      => true,
+        ),
+
+        'url_hls'      => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '标清地址',
+            'default'   => '',
+            'desc'      => '标清地址',
+            'match'     => 'option',
+            //'update'    => 'text',
+            //'list'      => true,
+        ),
+
+        'url_hdl'      => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '普清地址',
+            'default'   => '',
+            'desc'      => '普清地址',
+            'match'     => 'option',
+            //'update'    => 'text',
+            //'list'      => true,
+        ),
+
+        'url_pic'      => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '直播截图地址',
+            'default'   => '',
+            'desc'      => '直播截图地址',
+            'match'     => 'option',
+            //'update'    => 'text',
+            //'list'      => true,
         ),
 
         'info'      => array
@@ -96,7 +180,21 @@ return array
             'desc'      => '直播信息',
             'match'     => 'option',
             //'update'    => 'text',
+            'list'      => 'Dever::load("live/lib/manage.liveInfo", {id})',
+        ),
+
+        'disabled'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '禁播流',
+            'default'   => '1',
+            'desc'      => '禁播流',
+            'match'     => 'is_numeric',
+            //'update'    => 'select',
+            'option'    => $disabled,
+            'search'    => 'select',
             'list'      => true,
+            'edit'      => true,
         ),
 
         'state'     => array
@@ -117,16 +215,21 @@ return array
             # 只有insert时才生效
             'insert'    => true,
             //'search'  => 'date',
-            'list'      => 'date("Y-m-d H:i:s", {cdate})',
+            //'list'      => 'date("Y-m-d H:i:s", {cdate})',
         ),
     ),
 
     'manage' => array
     (
         //'excel'   => true,
-        //'delete' => false,
+        'delete' => false,
         'edit' => false,
         //'insert' => false,
+
+        'button' => array
+        (
+            '同步所有流' => 'live/lib/manage.getStream',
+        ),
     ),
 
     'request' => array

live/lib/Cron.php

@@ -5,11 +5,18 @@ use Dever;
 
 class Cron
 {
-    # 定时获取
-    public function test()
+    # 定时获取 所有流的状态
+    public function getStream()
     {
-        
+        $data = Dever::db('live/stream')->state();
 
-        return $data;
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $handle = new Handle();
+                $data = $handle->get($id);
+            }
+        }
+
+        return 'yes';
     }
 }

live/lib/Handle.php

@@ -0,0 +1,101 @@
+<?php
+namespace Live\Lib;
+
+use Dever;
+
+class Handle
+{
+    public function method($config)
+    {
+        if ($config['type'] == 1) {
+            $method = new Qiniu($config);
+        }
+
+        return $method;
+    }
+
+    # 启动
+    public function start($id)
+    {
+        $info = Dever::db('live/stream')->one($id);
+        $config = Dever::db('live/info')->one($info['live_id']);
+        $method = $this->method($config);
+        $stream = $method->start($info['key']);
+    }
+
+    # 禁播
+    public function stop($id)
+    {
+        $info = Dever::db('live/stream')->one($id);
+        $config = Dever::db('live/info')->one($info['live_id']);
+        $method = $this->method($config);
+        $stream = $method->stop($info['key']);
+    }
+
+    # 初始化流
+    public function init($id, $name = '')
+    {
+        $info = Dever::db('live/stream')->one($id);
+        if ($info['url_rtmp']) {
+            return;
+        }
+        if ($name) {
+            $info['key'] = $name;
+        }
+        $config = Dever::db('live/info')->one($info['live_id']);
+        
+        $method = $this->method($config);
+        $stream = $method->create($info['key']);
+
+        $rtmp = $method->getRtmp($info['key'], $info['times'] * 3600);
+
+        $url = $method->getPlay($info['key']);
+
+        $data['where_id'] = $id;
+        $data['live'] = $rtmp;
+        $data['url_rtmp'] = $url['rtmp'];
+        $data['url_hls'] = $url['hls'];
+        $data['url_hdl'] = $url['hdl'];
+        $data['url_pic'] = $url['pic'];
+        $live['info'] = $stream;
+
+        $data['info'] = Dever::json_encode($live);
+
+        Dever::db('live/stream')->update($data);
+
+        return $data;
+    }
+
+    # 获取流信息 定时跑
+    public function get($id)
+    {
+        $info = Dever::db('live/stream')->one($id);
+
+        $time = time();
+
+        if ($time <= $info['sdate']) {
+            return;
+        }
+        $config = Dever::db('live/info')->one($info['live_id']);
+        
+        $method = $this->method($config);
+
+        $stream = $method->getInfo($info['key']);
+
+        $live = $method->getLiveStatus($info['key']);
+
+        $hitory = $method->history($info['key']);
+
+        $data['where_id'] = $id;
+        $live = Dever::json_decode($info['info']);
+        $live['info'] = $stream;
+        $live['live'] = $live;
+        $live['hitory'] = $history;
+
+        $data['info'] = Dever::json_encode($live);
+
+        Dever::db('live/stream')->update($data);
+
+        return $data;
+    }
+}

live/lib/Manage.php

@@ -6,16 +6,121 @@ use Dever;
 class Manage
 {
     # 获取所有的流
-	public function getStream()
+	public function getStream_api()
     {
-    	
+        $handle = new Handle();
+    	$info = Dever::db('live/info')->state();
+        foreach ($info as $k => $v) {
+            $data = $handle->method($v)->gets();
+            if (isset($data['keys']) && $data['keys']) {
+                foreach ($data['keys'] as $k1 => $v1) {
+                    $this->insertStream($v1);
+                }
+            }
+        }
 
-        return $data;
+        return 'yes';
+    }
+
+    private function insertStream($name)
+    {
+        $data['key'] = $name;
+        $info = Dever::db('live/stream')->one($data);
+
+        if (!$info) {
+            $data['name'] = $name;
+            $id = Dever::db('live/stream')->insert($data);
+        } else {
+            $id = $info['id'];
+        }
+
+        $handle = new Handle();
+        $data = $handle->init($id, $name);
     }
 
     # 创建新流
     public function createStream($id, $name, $data)
     {
-    	
+        $name = Dever::param('key', $data);
+
+        $handle = new Handle();
+        $data = $handle->init($id, $name);
+    }
+
+    # 禁播流
+    public function updateDisabled($id, $name, $data)
+    {
+        $disabled = Dever::param('disabled', $data);
+
+        $handle = new Handle();
+        if ($disabled == 1) {
+            $handle->start($id);
+        } else {
+            $handle->stop($id);
+        }
+    }
+
+    # 获取流信息
+    public function liveData($id)
+    {
+        $info = Dever::db('live/stream')->one($id);
+
+        $html = $info['name'] . '('.$info['key'].')';
+        return $html;
+    }
+
+    # 获取直播地址
+    public function live($id)
+    {
+        $info = Dever::db('live/stream')->one($id);
+
+        $table['推流地址'] = $info['live'];
+        $table['高清地址'] = $info['url_rtmp'];
+        $table['标清地址'] = $info['url_hls'];
+        $table['普清地址'] = $info['url_hdl'];
+        $table['截图地址'] = $info['url_pic'];
+        return Dever::table($table);
+    }
+
+    # 获取直播信息
+    public function liveInfo($id)
+    {
+        $info = Dever::db('live/stream')->one($id);
+
+        $table = array();
+        if ($info['info']) {
+            $data = Dever::json_decode($info['info']);
+
+            if (isset($data['live']) && $data['live']) {
+                $table['直播状态'] = '直播中';
+                if ($info['status'] != 2) {
+                    Dever::db('live/stream')->update(array('where_id' => $id, 'status' => 2));
+                }
+                $table['开始时间'] = date('Y-m-d H:i:s', $data['live']['startAt']);
+                $table['主播IP'] = $data['live']['clientIP'];
+                $table['当前码率'] = $data['live']['bps'];
+                $table['音频帧率'] = $data['live']['fps']['audio'];
+                $table['视频帧率'] = $data['live']['fps']['video'];
+                $table['数据帧率'] = $data['live']['fps']['data'];
+
+            } elseif (isset($data['hitory']) && $data['hitory']) {
+                $table['直播状态'] = '已结束';
+                if ($info['status'] != 3) {
+                    Dever::db('live/stream')->update(array('where_id' => $id, 'status' => 3));
+                }
+                $history = array();
+                foreach ($data['history'] as $k => $v) {
+                    $history['第' . ($k+1) . '次直播'] = date('Y-m-d H:i:s', $v['start']) . '~' . date('Y-m-d H:i:s', $v['end']);
+                }
+                $table['直播历史'] = Dever::table($history);
+            } else {
+                $table['直播状态'] = '未开始';
+                if ($info['status'] != 1) {
+                    Dever::db('live/stream')->update(array('where_id' => $id, 'status' => 1));
+                }
+            }
+        }
+        
+        return Dever::table($table);
     }
 }

live/lib/Qiniu.php

@@ -0,0 +1,159 @@
+<?php
+namespace Live\Lib;
+
+use Dever;
+
+Dever::apply('sdk/qiniu', 'live');
+
+class Qiniu
+{
+    private $stream;
+    private $config;
+    private $space;
+
+    # 连接
+    public function __construct($config)
+    {
+        $this->config = $config;
+        $mac = new \Qiniu\Pili\Mac($this->config['appkey'], $this->config['appsecret']);
+        $client = new \Qiniu\Pili\Client($mac);
+        $this->space = $client->hub($this->config['space']);
+    }
+
+    # 创建新流
+    public function create($name)
+    {
+        $result = $this->space->create($name);
+
+        return $this->getInfo($name);
+    }
+
+    # 查询流
+    public function get($name)
+    {
+        if (!$this->stream) {
+            $this->stream = $this->space->stream($name);
+        }
+
+        return $this->stream;
+    }
+
+    # 查询流的信息
+    public function getInfo($name)
+    {
+        $stream = $this->get($name);
+
+        return $stream->info();
+    }
+
+    # 获取直播状态
+    public function getLiveStatus($name)
+    {
+        $stream = $this->get($name);
+
+        return $stream->liveStatus();
+    }
+
+    # 列出所有流
+    public function gets($prefix = '', $limit = 10000)
+    {
+        return $this->space->listStreams($prefix, $limit, '');
+    }
+
+    # 列出所有正在直播的流
+    public function getLives($prefix = '', $limit = 10000)
+    {
+        return $this->space->listLiveStreams($prefix, $limit, '');
+    }
+
+    # 启动流
+    public function start($name = '')
+    {
+        $stream = $this->get($name);
+        $stream->enable();
+        return $this->getLiveStatus($name);
+    }
+
+    # 禁用流
+    public function stop($name = '', $num = 120)
+    {
+        $stream = $this->get($name);
+        $stream->disable(time() + $num);
+        return $this->getLiveStatus($name);
+    }
+
+    # 保存直播数据
+    public function save($name, $start, $end)
+    {
+        $stream = $this->get($name);
+        return $stream->saveas(array("format" => "mp4"), $start, $end);
+    }
+
+    # 保存直播截图
+    public function savePic($name)
+    {
+        $stream = $this->get($name);
+        return $stream->snapshot(array("format" => "jpg"));
+    }
+
+    # 查看历史直播流
+    public function history($name)
+    {
+        $stream = $this->get($name);
+        return $stream->historyActivity(0, 0);
+    }
+
+    # 查询推流历史
+    public function update($name, $convert)
+    {
+        $stream = $this->get($name);
+        $stream->updateConverts($convert);
+        return $stream->info();
+    }
+
+    # 获取推流地址
+    public function getRtmp($name, $time = 3600)
+    {
+        $url = \Qiniu\Pili\RTMPPublishURL("publish-rtmp.test.com", $this->config['space'], $name, 3600, $this->config['appkey'], $this->config['appsecret']);
+        return $url;
+    }
+
+    # 获取直播地址
+    public function getPlay($name)
+    {
+        //高清、标清、普清
+        $url['rtmp'] = $this->getRtmpPlay($name);
+        $url['hls'] = $this->getHlsPlay($name);
+        $url['hdl'] = $this->getHdlPlay($name);
+        $url['pic'] = $this->getPicPlay($name);
+        return $url;
+    }
+
+    # 获取直播地址
+    public function getRtmpPlay($name)
+    {
+        $url = \Qiniu\Pili\RTMPPlayURL("live-rtmp.test.com", $this->config['space'], $name);
+        return $url;
+    }
+
+    # HLS 直播地址
+    public function getHlsPlay($name)
+    {
+        $url = \Qiniu\Pili\HLSPlayURL("live-hls.test.com", $this->config['space'], $name);
+        return $url;
+    }
+
+    # HDL 直播地址
+    public function getHdlPlay($name)
+    {
+        $url = \Qiniu\Pili\HDLPlayURL("live-hdl.test.com", $this->config['space'], $name);
+        return $url;
+    }
+
+    # 截图直播地址
+    public function getPicPlay($name)
+    {
+        $url = \Qiniu\Pili\SnapshotPlayURL("live-snapshot.test.com", $this->config['space'], $name);
+        return $url;
+    }
+}

main/database/focus.php

@@ -14,9 +14,10 @@ return array
 	# 表名
 	'name' => 'focus',
 	# 显示给用户看的名称
-	'lang' => '焦点图管理',
+	'lang' => '焦点图管理-废弃',
 	# 后台菜单排序
 	'order' => 9,
+	'menu' => false,
 	# 数据结构
 	'struct' => array
 	(

push/database/data.php

@@ -0,0 +1,275 @@
+<?php
+
+# 定义几个常用的选项
+$option = array
+(
+    1 => '显示',
+    2 => '不显示',
+);
+
+$type = Dever::config('base')->type;
+$type[10] = '链接';
+
+
+$list = function()
+{
+    return Dever::db('push/info')->state();
+};
+$info = Dever::input('search_option_info_id');
+
+if ($info) {
+    $info = Dever::load('push/info-one', $info);
+
+    if (!$info) {
+        echo 'error';die;
+    }
+    $info['name'] .= '下的推送数据管理';
+    $info['col'] = explode(',', $info['col']);
+    /*
+    $preview = $info['preview'];
+    $preview_height = $info['preview_height'] ? $info['preview_height'] : 500;
+    */
+
+    $name_state = in_array(1, $info['col']);
+    $link_state = in_array(2, $info['col']);
+    $pic_state = in_array(3, $info['col']);
+    $content_state = in_array(4, $info['col']);
+
+    /*
+    if ($info['data_type']) {
+        $type = explode("\r\n", $info['data_type']);
+    }
+    */
+} else {
+    $info = array();
+    $info['name'] = '推送数据管理';
+    $info['col_pic'] = '100X100';
+    $info['col_content'] = '30';
+    $info['type'] = 1;
+    $name_state = true;
+    $link_state = false;
+    $pic_state = false;
+    $content_state = false;
+    $preview = '';
+    $preview_height = 0;
+}
+
+
+return array
+(
+    # 表名
+    'name' => 'data',
+    # 显示给用户看的名称
+    'lang' => $info['name'],
+    'order' => 20,
+    //'menu' => false,
+
+    //'desc' => '预览地址：<br /><iframe id="preview" height="'.$preview_height.'" width="100%"  frameborder="no" border="0" marginwidth="0" marginheight="0" scrolling="no" allowtransparency="yes" src="'.$preview.'" ></iframe>',
+
+    # 数据结构
+    'struct' => array
+    (
+        'id'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => 'ID',
+            'default'   => '',
+            'desc'      => '',
+            'match'     => 'is_numeric',
+            //'search'  => 'order',
+            'order'     => 'desc',
+            //'list'        => true,
+        ),
+
+        'info_id'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '推送位',
+            'default'   => Dever::input('search_option_info_id', '1'),
+            'desc'      => '推送位',
+            'match'     => 'is_numeric',
+            'search'    => 'select',
+            'update'    => 'select',
+            'option'    => $list,
+            'list'      => true,
+        ),
+
+        'type'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '类型',
+            'default'   => '1',
+            'desc'      => '请选择类型',
+            'match'     => 'is_numeric',
+            'update'    => 'radio',
+            'search'    => 'select',
+            'option'    => $type,
+            'control'   => 'type',
+        ),
+
+        'article_id'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '关联图文',
+            'default'   => '',
+            'desc'      => '关联图文',
+            'match'     => 'option',
+            'update'    => 'select',
+            'show'      => 'type=1',
+            'update_search' => 'journal/lib/manage.search_article',
+        ),
+
+        'vod_id'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '关联视频',
+            'default'   => '',
+            'desc'      => '关联视频',
+            'match'     => 'option',
+            'update'    => 'select',
+            'show'      => 'type=2',
+            'update_search' => 'journal/lib/manage.search_vod',
+        ),
+
+        'live_id'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '关联直播',
+            'default'   => '',
+            'desc'      => '关联直播',
+            'match'     => 'option',
+            'update'    => 'select',
+            'show'      => 'type=3',
+            'update_search' => 'journal/lib/manage.search_live',
+        ),
+
+        'journal_id'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '关联小刊',
+            'default'   => '',
+            'desc'      => '关联小刊',
+            'match'     => 'option',
+            'update'    => 'select',
+            'show'      => 'type=4',
+            'update_search' => 'journal/lib/manage.search_journal',
+        ),
+
+        'olink'      => array
+        (
+            'type'      => 'varchar-400',
+            'name'      => '链接',
+            'default'   => '',
+            'desc'      => '请输入链接',
+            'match'     => 'option',
+            'update'    => 'text',
+            'show'      => 'type=10',
+            //'search'    => 'fulltext',
+            //'list'        => true,
+        ),
+        
+        'name'      => array
+        (
+            'type'      => 'varchar-60',
+            'name'      => '标题-手动干扰项，如想在当前推送位的标题请在此修改',
+            'default'   => '',
+            'desc'      => '请输入标题',
+            'match'     => $name_state ? 'option' : 'option',
+            'update'    => $name_state ? 'text' : 'hidden',
+            'search'    => $name_state ? 'fulltext' : '',
+            'list'      => $name_state ? 'Dever::load("push/lib/manage.name", {id})' : false,
+            'edit'      => $name_state ? true : false,
+        ),
+
+        'link'      => array
+        (
+            'type'      => 'varchar-200',
+            'name'      => '链接-手动干扰项，如想在当前推送位的链接请在此修改',
+            'default'   => '',
+            'desc'      => '请输入链接',
+            'match'     => $link_state ? 'option' : 'option',
+            //'update'    => $link_state ? 'text' : 'hidden',
+            //'search'    => $link_state ? 'fulltext' : '',
+            //'list'        => $link_state ? true : false,
+            //'edit'      => $link_state ? true : false,
+        ),
+
+        'pic'       => array
+        (
+            'type'      => 'varchar-200',
+            'name'      => '图片-手动干扰项，请上传,' . $info['col_pic'] . '大小的图片',
+            'default'   => '',
+            'desc'      => '请选择图片',
+            'match'     => $pic_state ? 'option' : 'option',
+            'update'    => $pic_state ? 'image' : 'hidden',
+            'search'    => $pic_state ? 'fulltext' : '',
+            //'list'        => $pic_state ? true : false,
+            'key'       => 1
+        ),
+
+        'content'       => array
+        (
+            'type'      => 'text-255',
+            'name'      => '描述-手动干扰项，字数请不要超过' . $info['col_content'] . '个汉字，前台展示时会自动过滤',
+            'default'   => '',
+            'desc'      => '请输入描述',
+            'match'     => $content_state ? 'option' : 'option',
+            'update'    => $content_state ? 'editor' : 'hidden',
+        ),
+        
+        'reorder'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '排序(数值越大越靠前)',
+            'default'   => '1',
+            'desc'      => '请输入排序',
+            'match'     => 'option',
+            'update'    => 'text',
+            'search'    => 'order',
+            'list_name' => '排序',
+            'list'      => true,
+            'order'     => 'desc',
+            'edit'      => true,
+        ),
+
+        'state'     => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '状态',
+            'default'   => '1',
+            'desc'      => '请选择状态',
+            'match'     => 'is_numeric',
+        ),
+        
+        'cdate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '录入时间',
+            'match'     => array('is_numeric', time()),
+            'desc'      => '',
+            # 只有insert时才生效
+            'insert'    => true,
+            'list'      => 'date("Y-m-d H:i:s", {cdate})',
+        ),
+    ),
+
+    # request 请求接口定义
+    'request' => array
+    (
+        # 获取列表页
+        'getAllByType' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'type' => 'yes',
+                'info_id' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('reorder' => 'desc'),
+            //'col' => '*|type|',
+            'col' => '*',
+        ),
+    ),
+);

push/database/info.php

@@ -0,0 +1,314 @@
+<?php
+
+# 显示的页面
+/*
+$curPage = Dever::input('search_option_page_id');
+$page = function()
+{
+    $parent = Dever::db('push/page')->getParent();
+    $child = Dever::db('push/page')->getChild();
+    foreach ($parent as $k => $v) {
+        $parent[$k]['child'] = $child[$v['id']];
+    }
+
+    $array = array(-1 => array('id' => -1, 'name' => '无'));
+
+    if ($parent) {
+        $array += $parent;
+    }
+
+    return $array;
+};
+*/
+
+$type = array
+(
+    1 => '手动输入',
+    /*
+    2 => '调取其他推送位',
+    3 => '预定义方法',
+    4 => '自定义方法',
+    5 => '自定义SQL',
+    6 => '自定义接口',
+    */
+);
+
+//$define = Dever::config('base')->module;
+
+$col = array
+(
+    1 => '标题',
+    //2 => '链接',
+    3 => '图片',
+    4 => '描述',
+);
+
+return array
+(
+    # 表名
+    'name' => 'info',
+    # 显示给用户看的名称
+    'lang' => '推送位管理',
+    'order' => 10,
+    'check' => 'key',
+    # 数据结构
+    'struct' => array
+    (
+        'id'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => '推送位ID',
+            'default'   => '',
+            'desc'      => '',
+            'match'     => 'is_numeric',
+            //'search'  => 'order',
+            'order'     => 'desc',
+            //'list'        => true,
+        ),
+        
+        'name'      => array
+        (
+            'type'      => 'varchar-60',
+            'name'      => '推送位标题',
+            'default'   => '',
+            'desc'      => '请输入推送位标题',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            'search'    => 'fulltext',
+            'list'      => true,
+            'edit'      => true,
+        ),
+
+        'key'       => array
+        (
+            'type'      => 'varchar-60',
+            'name'      => '推送位标识',
+            'default'   => '',
+            'desc'      => '推送位标识',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            'search'    => 'fulltext',
+            'list'      => true,
+        ),
+
+        'num'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '数据总条数-为空或小于0则不限制，只对前台有效',
+            'default'   => '5',
+            'desc'      => '请输入数据总条数',
+            'match'     => 'is_numeric',
+            'update'    => 'text',
+            'list'      => true,
+            'edit'      => true,
+        ),
+
+        'type'      => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '推送位类型',
+            'default'   => '1',
+            'desc'      => '请选择推送位类型',
+            'match'     => 'is_numeric',
+            'option'    => $type,
+            'update'    => 'radio',
+            'search'    => 'select',
+            //'list'        => true,
+            'control'       => 'type',
+        ),
+
+        /*
+        'data_type'     => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '数据类型定义-多个用换行隔开，必须有一个值，主要用于该推送位有多种不同类型的值',
+            'default'   => '默认类型',
+            'desc'      => '请选择推送位类型',
+            'match'     => 'is_string',
+            //'update'  => 'textarea',
+            //'show'        => array('type_1'),
+        ),
+
+        'code'      => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '自定义内容',
+            'default'   => '',
+            'desc'      => '请输入自定义内容',
+            'match'     => 'is_string',
+            'update'    => 'textarea',
+            'show'      => 'type=4,5,6',
+        ),
+
+        'sql_method'        => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '选择sql执行之后的方法',
+            'default'   => '1',
+            'desc'      => '选择sql执行之后的方法',
+            'match'     => 'is_numeric',
+            'update'    => 'radio',
+            'option'    => $sqlMethod,
+            'show'      => 'type=5',
+        ),
+
+        'define'        => array
+        (
+            'type'      => 'varchar-100',
+            'name'      => '选择预定义方法',
+            'default'   => '',
+            'desc'      => '请选择预定义方法',
+            'match'     => 'is_string',
+            'update'    => 'select',
+            'option'    => $define,
+            'show'      => 'type=3'
+        ),
+        */
+
+        'col'       => array
+        (
+            'type'      => 'varchar-30',
+            'name'      => '启用的字段',
+            'default'   => '1',
+            'desc'      => '请选择启用的字段',
+            'match'     => 'is_string',
+            'option'    => $col,
+            'update'    => 'checkbox',
+            'show'      => 'type=1',
+            'control'   => 'col',
+        ),
+
+        'col_pic'       => array
+        (
+            'type'      => 'varchar-20',
+            'name'      => '图片尺寸提醒-请直接输入提醒的文字即可，如100X100',
+            'default'   => '100X100',
+            'desc'      => '图片尺寸提醒',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            'show'      => 'col=3',
+        ),
+
+        'col_content'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '内容长度限制-必须是数字',
+            'default'   => '30',
+            'desc'      => '内容长度限制',
+            'match'     => 'is_numeric',
+            'update'    => 'text',
+            'show'      => 'col=4',
+        ),
+
+        /*
+        'relate_id'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '请输入推送位id',
+            'default'   => '',
+            'desc'      => '请输入推送位id',
+            'match'     => 'is_numeric',
+            'update'    => 'text',
+            'show'      => 'type=2',
+        ),
+
+        'preview'       => array
+        (
+            'type'      => 'varchar-200',
+            'name'      => '推送位预览地址',
+            'default'   => '',
+            'desc'      => '推送位预览地址',
+            'match'     => 'option',
+            'update'    => 'text',
+        ),
+
+        'preview_height'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => '推送位预览的高度',
+            'default'   => '500',
+            'desc'      => '推送位预览的高度',
+            'match'     => 'option',
+            'update'    => 'text',
+        ),
+        */
+        
+        'reorder'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '排序(数值越大越靠前)',
+            'default'   => '1',
+            'desc'      => '请输入排序',
+            'match'     => 'option',
+            'update'    => 'text',
+            'search'    => 'order',
+            'list_name' => '排序',
+            'list'      => true,
+            'order'     => 'desc',
+            //'edit'        => true,
+        ),
+
+        'state'     => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '状态',
+            'default'   => '1',
+            'desc'      => '请选择状态',
+            'match'     => 'is_numeric',
+        ),
+        
+        'cdate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '录入时间',
+            'match'     => array('is_numeric', time()),
+            'desc'      => '',
+            # 只有insert时才生效
+            'insert'    => true,
+            'list'      => 'date("Y-m-d H:i:s", {cdate})',
+        ),
+    ),
+
+    # 权限精细控制 加入到该项目的详细权限中，注意与top的不同
+    /*
+    'auth' => array
+    (
+        # 数据来源
+        'data' => 'all',
+        # 所属项目
+        'project' => 'module',
+        # 项目名称
+        'project_name' => '推送位管理',
+    ),
+    */
+
+    'manage' => array
+    (
+        //'insert' => $curPage ? true : false,
+        'list_button' => array
+        (
+            'add' => array('新增数据', '"data&search_option_info_id={id}&oper_parent=info"', '{type} == 1'),
+
+            'list' => array('数据列表', '"data&search_option_info_id={id}&oper_parent=info"'),
+        ),
+    ),
+
+    # request 请求接口定义
+    'request' => array
+    (
+        # 获取列表页
+        'getAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'type' => 'yes',
+                //'page_id' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('reorder' => 'desc'),
+            'col' => '*',
+        ),
+    ),
+);

push/index.php

@@ -0,0 +1,8 @@
+<?php
+
+define('DEVER_APP_NAME', 'push');
+define('DEVER_APP_LANG', '推送管理');
+define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+define('DEVER_MANAGE_ORDER', 199);
+define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-tower layui-icon-template-1');
+include(DEVER_APP_PATH . '../boot.php');

push/lib/Manage.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Push\Lib;
+
+use Dever;
+
+class Manage
+{
+    //{source_id} > 0 ? ("{name}" ? "{name}" : Dever::load("sad/supply-one#name", {source_id})) : "{name}"
+    public function name($id)
+    {
+        $info = Dever::db('push/data')->one($id);
+
+        if ($info['name']) {
+            return $info['name'];
+        }
+
+        if ($info['type'] < 10) {
+            $table = Dever::config('base')->type_table[$info['type']];
+            if ($info['type'] == 1) {
+                $data = Dever::db($table)->one($info['article_id']);
+            } elseif ($info['type'] == 2) {
+                $data = Dever::db($table)->one($info['vod_id']);
+            } elseif ($info['type'] == 3) {
+                $data = Dever::db($table)->one($info['live_id']);
+            } elseif ($info['type'] == 4) {
+                $data = Dever::db($table)->one($info['journal_id']);
+            }
+
+            if (isset($data) && $data && isset($data['name'])) {
+                return $data['name'];
+            }
+        }
+
+        return $info['name'];
+    }
+}

video/database/live.php

@@ -23,6 +23,17 @@ $cate = function()
 	return $array;
 };
 
+$stream = function()
+{
+	$array = array();
+	$info = Dever::db('live/stream')->state();
+	if($info)
+	{
+		$array += $info;
+	}
+	return $array;
+};
+
 return array
 (
 	# 表名
@@ -40,6 +51,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '',
 			'match' 	=> 'is_numeric',
+			'list'		=> true,
 		),
 		
 		'name'		=> array
@@ -77,17 +89,30 @@ return array
 			'place'		=> '150',
 		),
 
-		'link'		=> array
+		'stream_id'		=> array
 		(
-			'type' 		=> 'varchar-800',
-			'name' 		=> '直播推流地址',
+			'type' 		=> 'int-11',
+			'name' 		=> '直播流选择',
 			'default' 	=> '',
-			'desc' 		=> '直播推流地址',
-			'match' 	=> 'is_string',
-			'update'	=> 'text',
+			'desc' 		=> '直播流选择',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'select',
+			'option'	=> $stream,
 			'list'		=> true,
 		),
 
+		'sdate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '开始时间',
+            'match'     => 'is_numeric',
+            'default'   => '',
+            'desc'      => '',
+            'update'    => 'date',
+            'callback'  => 'maketime',
+            'list'      => 'date("Y-m-d H:i:s", {sdate})',
+        ),
+
 		'num_add_user'		=> array
 		(
 			'type' 		=> 'int-11',
@@ -179,17 +204,6 @@ return array
 			'match' 	=> 'is_numeric',
 		),
 
-		'sdate'		=> array
-		(
-			'type' 		=> 'int-11',
-			'name' 		=> '开始时间',
-			'match' 	=> 'is_numeric',
-			'desc' 		=> '',
-			'update'	=> 'date',
-			'callback'	=> 'maketime',
-			'list'		=> 'date("Y-m-d H:i:s", {sdate})',
-		),
-
 		'pdate'		=> array
 		(
 			'type' 		=> 'int-11',

video/database/vod.php

@@ -50,6 +50,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '',
 			'match' 	=> 'is_numeric',
+			'list'		=> true,
 		),
 		
 		'name'		=> array