edit

content/database/article.php

@@ -228,7 +228,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '分享海报',
 			'match' 	=> 'option',
-			'update'	=> 'checkbox',
+			//'update'	=> 'checkbox',
 			'option'	=> $share,
 		),
 

data/compile/wonderful/journal/manage/journal.cmp.php

@@ -0,0 +1,45 @@
+<?php $data['journal/lib/manage.journalContent']=Dever::load('journal/lib/manage.journalContent') ?>
+<div class="layui-fluid layadmin-cmdlist-fluid" test="公告">
+  <ul class="layui-row layui-col-space30" id="sortable">
+    <?php if(isset($data['journal/lib/manage.journalContent']) && is_array($data['journal/lib/manage.journalContent'])): ?><?php $t=count($data['journal/lib/manage.journalContent'])-1 ?><?php $i=0 ?><?php foreach($data['journal/lib/manage.journalContent'] as $k => $v): ?><li class="layui-col-md2 layui-col-sm4" id="data-<?php  echo $v['id'] ?>">
+        <div class="cmdlist-container">
+            <div href="javascript:;" style="height:auto;text-align: center;">
+              <img src="<?php  echo $v['pic'] ?>" width="150">
+            </div>
+            <a href="javascript:;">
+              <div class="cmdlist-text">
+                <p class="info"><?php  echo $v['name'] ?></p>
+                <div class="price">
+                    <b></b>
+                </div>
+
+                <div class="text"><?php  echo $v['text'] ?></div>
+                
+
+                <div style="margin-top:10px;text-align:center;">
+                <div class="layui-table-cell"><a href="javascript:;" class="edit" onclick="<?php  echo $v['edit'] ?>"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 layui-btn layui-btn-xs">编辑</button></a>&nbsp;&nbsp;<a href="<?php  echo $v['delete'] ?>" class="oper_delete"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 layui-btn layui-btn-danger layui-btn-xs"><span class="am-icon-trash-o"></span>删除</button></a>&nbsp;&nbsp;</div>
+                </div>
+              </div>
+            </a>
+        </div>
+    </li><?php $i=$i+1 ?><?php endforeach; ?><?php else: ?><?php echo $data['journal/lib/manage.journalContent'] ?><?php endif; ?>
+  </ul>
+</div>
+
+<script id="url">var url="<?php  echo Dever::url("journal/lib/manage.updateJournalContent") ?>"</script>
+<script>
+  $( function() {
+    var sort = $( "#sortable" ).sortable({
+        opacity: 0.7,
+        stop:function(){
+          var arr = $( "#sortable" ).sortable('toArray');
+          arr = arr.join(',');
+          $.post(url, {data:arr}, function()
+          {
+
+          })
+        }
+    });
+    $( "#sortable" ).disableSelection();
+  } );
+  </script>

journal/database/active.php

@@ -1,5 +1,10 @@
 <?php
 
+$status = array
+(
+    1 => '开启',
+    2 => '关闭',
+);
 return array
 (
     # 表名
@@ -40,6 +45,17 @@ return array
             'value'     => Dever::input('search_option_info_id')
         ),
 
+        'status'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '活动状态',
+            'default'   => '1',
+            'desc'      => '活动状态',
+            'match'     => 'is_numeric',
+            'update'    => 'radio',
+            'option'    => $status,
+        ),
+
         'name'      => array
         (
             'type'      => 'varchar-80',
@@ -52,6 +68,30 @@ return array
             'list'      => true,
         ),
 
+        'start'       => array
+        (
+            'type'      => 'int-11',
+            'default'   => '',
+            'name'      => '活动开始时间',
+            'match'     => 'is_string',
+            'desc'      => '活动开始时间',
+            'update'    => 'date',
+            'list'      => 'date("Y-m-d H:i:s", {start})',
+            'callback'  => 'maketime',
+        ),
+
+        'end'       => array
+        (
+            'type'      => 'int-11',
+            'default'   => '',
+            'name'      => '活动结束时间',
+            'match'     => 'is_string',
+            'desc'      => '活动结束时间',
+            'update'    => 'date',
+            'list'      => 'date("Y-m-d H:i:s", {end})',
+            'callback'  => 'maketime',
+        ),
+
         'desc'      => array
         (
             'type'      => 'varchar-800',

live/config/base.php

@@ -0,0 +1,10 @@
+<?php
+$config['base'] = array
+(
+	# 功能类型
+	'live_type' => array
+	(
+		1 => '七牛云',
+	),
+);
+return $config;

live/database/info.php

@@ -0,0 +1,119 @@
+<?php
+
+$type = Dever::config('base', 'live')->live_type;
+return array
+(
+    # 表名
+    'name' => 'info',
+    # 显示给用户看的名称
+    'lang' => '直播云配置',
+    'order' => 10,
+    # 数据结构
+    'struct' => array
+    (
+    
+        'id'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => 'ID',
+            'default'   => '',
+            'desc'      => '',
+            'match'     => 'is_numeric',
+            'search'    => 'order',
+            //'list'        => true,
+        ),
+
+        'name'      => array
+        (
+            'type'      => 'varchar-300',
+            'name'      => '配置名称',
+            'default'   => '',
+            'desc'      => '配置名称',
+            'match'     => 'option',
+            'update'    => 'text',
+            'list'      => true,
+        ),
+
+        'type'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '所属云',
+            'default'   => '1',
+            'desc'      => '所属云',
+            'match'     => 'is_numeric',
+            'update'    => 'select',
+            'option'    => $type,
+            'search'    => 'select',
+        ),
+
+        'space'      => array
+        (
+            'type'      => 'varchar-300',
+            'name'      => '云空间名-请提前建好云空间，后续会迭代优化，增加云空间的创建和更新，本版本暂时使用已经创建好的云空间',
+            'default'   => '',
+            'desc'      => '空间名',
+            'match'     => 'option',
+            'update'    => 'text',
+            'list'      => true,
+        ),
+
+        'appkey'      => array
+        (
+            'type'      => 'varchar-80',
+            'name'      => 'appkey',
+            'default'   => '',
+            'desc'      => 'appkey',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            'search'    => 'fulltext',
+            'list'      => true,
+        ),
+
+        'appsecret'      => array
+        (
+            'type'      => 'varchar-200',
+            'name'      => 'appsecret',
+            'default'   => '',
+            'desc'      => 'appsecret',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            'search'    => 'fulltext',
+            'list'      => 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,
+            //'search'  => 'date',
+            'list'      => 'date("Y-m-d H:i:s", {cdate})',
+        ),
+    ),
+
+    'manage' => array
+    (
+        //'excel'   => true,
+        //'delete' => false,
+        //'edit' => false,
+        //'insert' => false,
+    ),
+
+    'request' => array
+    (
+        
+    )
+
+);

live/database/stream.php

@@ -0,0 +1,137 @@
+<?php
+
+$live = function()
+{
+    $array = array();
+    $info = Dever::db('live/info')->state();
+    if($info)
+    {
+        $array += $info;
+    }
+    return $array;
+};
+
+$status = array
+(
+    1 => '未开始',
+    2 => '直播中',
+    3 => '已结束',
+);
+
+return array
+(
+    # 表名
+    'name' => 'stream',
+    # 显示给用户看的名称
+    'lang' => '直播流管理',
+    'order' => 2,
+    # 数据结构
+    'struct' => array
+    (
+    
+        'id'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => 'ID',
+            'default'   => '',
+            'desc'      => '',
+            'match'     => 'is_numeric',
+            'search'    => 'order',
+            //'list'        => true,
+        ),
+
+        'live_id'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '所属直播云',
+            'default'   => '1',
+            'desc'      => '所属直播云',
+            'match'     => 'is_numeric',
+            'update'    => 'select',
+            'option'    => $live,
+            'search'    => 'select',
+            'list'      => true,
+        ),
+
+        'name'      => array
+        (
+            'type'      => 'varchar-300',
+            'name'      => '流名称',
+            'default'   => '',
+            'desc'      => '名称',
+            'match'     => 'option',
+            'update'    => 'text',
+            'list'      => true,
+        ),
+
+        'status'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '流状态',
+            'default'   => '1',
+            'desc'      => '流状态',
+            'match'     => 'is_numeric',
+            //'update'    => 'select',
+            'option'    => $status,
+            'search'    => 'select',
+            'list'      => true,
+        ),
+
+        'link'      => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '推流地址',
+            'default'   => '',
+            'desc'      => '推流地址',
+            'match'     => 'option',
+            //'update'    => 'text',
+            'list'      => true,
+        ),
+
+        'info'      => array
+        (
+            'type'      => 'text-255',
+            'name'      => '直播信息',
+            'default'   => '',
+            'desc'      => '直播信息',
+            'match'     => 'option',
+            //'update'    => 'text',
+            'list'      => 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,
+            //'search'  => 'date',
+            'list'      => 'date("Y-m-d H:i:s", {cdate})',
+        ),
+    ),
+
+    'manage' => array
+    (
+        //'excel'   => true,
+        //'delete' => false,
+        'edit' => false,
+        //'insert' => false,
+    ),
+
+    'request' => array
+    (
+        
+    )
+
+);

live/index.php

@@ -0,0 +1,8 @@
+<?php
+
+define('DEVER_APP_NAME', 'live');
+define('DEVER_APP_LANG', '直播管理');
+define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+define('DEVER_MANAGE_ORDER', 194);
+define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-tower layui-icon-camera');
+include(DEVER_APP_PATH . '../boot.php');

live/lib/Cron.php

@@ -0,0 +1,15 @@
+<?php
+namespace Live\Lib;
+
+use Dever;
+
+class Cron
+{
+    # 定时获取
+    public function test()
+    {
+        
+
+        return $data;
+    }
+}

live/lib/Manage.php

@@ -0,0 +1,21 @@
+<?php
+namespace Live\Lib;
+
+use Dever;
+
+class Manage
+{
+    # 获取所有的流
+	public function getStream()
+    {
+    	
+
+        return $data;
+    }
+
+    # 创建新流
+    public function createStream($id, $name, $data)
+    {
+    	
+    }
+}

live/sdk/Qiniu/Pili_v2.php

@@ -0,0 +1,14 @@
+<?php
+
+$root = dirname(__FILE__);
+
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'Utils.php')));
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'HttpResponse.php')));
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'HttpRequest.php')));
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'Mac.php')));
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'Config.php')));
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'Transport.php')));
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'Hub.php')));
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'Stream.php')));
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'Client.php')));
+require(join(DIRECTORY_SEPARATOR, array($root, 'Pili', 'RoomClient.php')));

live/sdk/qiniu.php

@@ -0,0 +1,3 @@
+<?php
+
+Dever::apply('sdk/Qiniu/Pili_v2', 'live');

video/database/live.php

@@ -12,6 +12,17 @@ $share = function()
 	return $array;
 };
 
+$cate = function()
+{
+	$array = array();
+	$info = Dever::db('content/cate')->state();
+	if($info)
+	{
+		$array += $info;
+	}
+	return $array;
+};
+
 return array
 (
 	# 表名
@@ -42,6 +53,18 @@ return array
 			'list'		=> true,
 		),
 
+		'cate_id'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '所属栏目',
+			'default' 	=> '1',
+			'desc' 		=> '所属栏目',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'select',
+			'option'	=> $cate,
+			'search'	=> 'select',
+		),
+
   		'pic_cover'		=> array
 		(
 			'type' 		=> 'varchar-150',
@@ -188,7 +211,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '分享海报',
 			'match' 	=> 'option',
-			'update'	=> 'checkbox',
+			//'update'	=> 'checkbox',
 			'option'	=> $share,
 		),
 

video/database/vod.php

@@ -214,7 +214,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '分享海报',
 			'match' 	=> 'option',
-			'update'	=> 'checkbox',
+			//'update'	=> 'checkbox',
 			'option'	=> $share,
 		),
 

video/sdk/Pili_v2.php

@@ -1,14 +0,0 @@
-<?php
-
-$root = dirname(__FILE__);
-
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'Utils.php')));
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'HttpResponse.php')));
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'HttpRequest.php')));
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'Mac.php')));
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'Config.php')));
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'Transport.php')));
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'Hub.php')));
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'Stream.php')));
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'Client.php')));
-require(join(DIRECTORY_SEPARATOR, array($root, 'Qiniu/Pili', 'RoomClient.php')));