edit

act/database/comment.php

@@ -128,6 +128,7 @@ return array
 			# 匹配的正则或函数 选填项
 			'option' => array
 			(
+				'uid' => 'yes',
 				'data_id' => 'yes',
 				'type' => 'yes',
 				'state' => 1,

act/database/like.php

@@ -93,4 +93,24 @@ return array
 		'edit' => false,
 		'delete' => false,
 	),
+
+	# request 请求接口定义
+	'request' => array
+	(
+		'getAll' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'uid' => 'yes',
+				'data_id' => 'yes',
+				'type' => 'yes',
+				'state' => 1,
+			),
+			'type' => 'all',
+			'order' => array('id' => 'desc'),
+			'page' => array(15, 'list'),
+			'col' => 'uid,type,data_id',
+		),
+	)
 );

act/database/live_note.php

@@ -63,6 +63,26 @@ return array
             'match'     => 'option',
             'list'      => 'Dever::load("act/lib/manage.load", "{type}", {data_id})',
         ),
+
+        'formid'      => array
+        (
+            'type'      => 'varchar-200',
+            'name'      => 'formid',
+            'default'   => '',
+            'desc'      => 'formid',
+            'match'     => 'is_string',
+            'update'    => 'text',
+        ),
+
+        'type'     => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '是否发送状态提醒-1未发送，2已发送',
+            'default'   => '1',
+            'desc'      => '请选择状态',
+            'match'     => 'is_numeric',
+        ),
+
         
         'state'     => array
         (

act/database/subscribe.php

@@ -0,0 +1,114 @@
+<?php
+
+$table = Dever::config('base')->type;
+return array
+(
+	# 表名
+	'name' => 'subscribe',
+	# 显示给用户看的名称
+	'lang' => '订阅日志',
+	# 是否显示在后台菜单
+	'order' => 68,
+	# 数据结构
+	'struct' => array
+	(
+		'id' 		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> 'ID',
+			'default' 	=> '',
+			'desc' 		=> '',
+			'match' 	=> 'is_numeric',
+			'order'		=> 'desc',
+			//'list'		=> true,
+		),
+		
+
+		'uid'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '用户名',
+			'default' 	=> '0',
+			'desc' 		=> '请选择用户',
+			'match' 	=> 'is_numeric',
+			//'update'	=> 'select',
+			//'search'	=> 'select',
+			'search'    => array
+            (
+                'api' => 'passport/user-all',
+                'col' => 'username',
+                'result' => 'id',
+            ),
+			'list'		=> '{uid} > 0 ? Dever::load("passport/user-one#username", {uid}) : "匿名用户"',
+		),
+
+		'type' 		=> array
+		(
+			'type' 		=> 'tinyint-1',
+			'name' 		=> '订阅类别',
+			'default' 	=> '',
+			'desc' 		=> '订阅类别',
+			'match' 	=> 'option',
+			//'search'	=> 'select',
+			'option' 	=> $table,
+			//'list'		=> true,
+		),
+		
+		'data_id' 		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '标题',
+			'default' 	=> '',
+			'desc' 		=> '标题',
+			'match' 	=> 'option',
+			'list'		=> 'Dever::load("act/lib/manage.load", "{type}", {data_id})',
+		),
+		
+		'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
+	(
+		'getAll' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'data_id' => 'yes',
+				'type' => 'yes',
+				'state' => 1,
+			),
+			'type' => 'all',
+			'order' => array('id' => 'desc'),
+			'page' => array(6, 'list'),
+			'col' => '*',
+		),
+	)
+);

act/lib/Comment.php

@@ -32,6 +32,15 @@ class Comment
         return $data;
     }
 
+    # 获取当前用户的评论列表
+    public function getList($uid)
+    {
+        $where['uid'] = $uid;
+        $info = Dever::db('act/like')->getAll($where);
+
+        return $info;
+    }
+
     # 发表评论
     public function submit($uid, $id, $type, $content)
     {

act/lib/Like.php

@@ -22,6 +22,15 @@ class Like
         }
     }
 
+    # 获取当前用户的点赞列表
+    public function getList($uid)
+    {
+        $where['uid'] = $uid;
+        $info = Dever::db('act/like')->getAll($where);
+
+        return $info;
+    }
+
     # 点赞+喜欢
     public function submit($uid, $id, $type)
     {

act/lib/Note.php

@@ -23,19 +23,29 @@ class Note
     }
 
     # 预约
-    public function submit($uid, $id, $type)
+    public function submit($uid, $id, $type, $formid = '')
     {
         $where['uid'] = $uid;
         $where['data_id'] = $id;
         $where['type'] = $type;
         $info = Dever::db('act/live_note')->one($where);
         if (!$info) {
+            if ($formid) {
+                $where['formid'] = $formid;
+            }
+            
             Dever::db('act/live_note')->insert($where);
         } else {
+            $update['where_id'] = $info['id'];
+            if ($formid) {
+                $update['formid'] = $formid;
+            }
             if ($info['state'] == 1) {
-                Dever::db('act/live_note')->update(array('where_id' => $info['id'], 'state' => 2));
+                $update['state'] = 2;
+                Dever::db('act/live_note')->update($update);
             } else {
-                Dever::db('act/live_note')->update(array('where_id' => $info['id'], 'state' => 1));
+                $update['state'] = 1;
+                Dever::db('act/live_note')->update($update);
             }
         }
 

act/lib/Subscribe.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Act\Lib;
+
+use Dever;
+
+class Subscribe
+{
+    # 获取小刊订阅列表
+    public function get($id, $type = 4)
+    {
+        $where['type'] = $type;
+        $where['data_id'] = $id;
+        $data = Dever::db('act/subscribe')->getAll($where);
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $user = Dever::load('passport/api')->info($v['uid']);
+                $data[$k]['username'] = $user['username'];
+                $data[$k]['avatar'] = $user['avatar'];
+            }
+        }
+        return $data;
+    }
+
+    # 订阅
+    public function submit($uid, $id, $type = 4)
+    {
+        $where['uid'] = $uid;
+        $where['data_id'] = $id;
+        $where['type'] = $type;
+        $table = 'act/subscribe';
+        $info = Dever::db($table)->one($where);
+        if (!$info) {
+            Dever::db($table)->insert($where);
+        }
+
+        # 更新订阅数
+        $where = array();
+        $where['data_id'] = $id;
+        $where['type'] = $type;
+        $where['state'] = 1;
+        $total = Dever::db($table)->total($where);
+        $table = Dever::config('base')->type_table[$type];
+        Dever::db($table)->update(array('where_id' => $id, 'num_ding' => $total));
+
+        return true;
+    }
+}

doc/apidoc.php

@@ -386,6 +386,10 @@
  * @apiSuccess {String}   info.pic_cover 图片
  * @apiSuccess {String}   info.type 类型，参考公共参数中的类型设置说明中的type说明，根据它生成path
  * @apiSuccess {String}   info.pdate 时间
+ * @apiSuccess {String}   info.cate_id 栏目ID
+ * @apiSuccess {String}   info.cate_name 栏目名称
+ * @apiSuccess {String}   info.author_id 作者ID
+ * @apiSuccess {String}   info.author_name 作者名称
  * @apiSuccess {String}   info.num_view 浏览量
  * @apiSuccess {String}   info.num_up 喜欢量
  * @apiSuccess {String}   info.num_comment 评论量
@@ -427,6 +431,10 @@
  * @apiSuccess {String}   info.pic_cover 图片
  * @apiSuccess {String}   info.type 类型，参考公共参数中的类型设置说明中的type说明，根据它生成path
  * @apiSuccess {String}   info.pdate 时间
+ * @apiSuccess {String}   info.cate_id 栏目ID
+ * @apiSuccess {String}   info.cate_name 栏目名称
+ * @apiSuccess {String}   info.author_id 作者ID
+ * @apiSuccess {String}   info.author_name 作者名称
  * @apiSuccess {String}   info.num_view 浏览量
  * @apiSuccess {String}   info.num_up 喜欢量
  * @apiSuccess {String}   info.num_comment 评论量
@@ -468,6 +476,10 @@
  * @apiSuccess {String}   info.pic_cover 封面图片
  * @apiSuccess {String}   info.type 类型，参考公共参数中的类型设置说明中的type说明，根据它生成path
  * @apiSuccess {String}   info.pdate 时间
+ * @apiSuccess {String}   info.cate_id 栏目ID
+ * @apiSuccess {String}   info.cate_name 栏目名称
+ * @apiSuccess {String}   info.author_id 作者ID
+ * @apiSuccess {String}   info.author_name 作者名称
  * @apiSuccess {String}   info.sdate_time 开始时间
  * @apiSuccess {String}   info.edate_time 结束时间
  * @apiSuccess {String}   info.num_user 在线人数
@@ -582,3 +594,89 @@
  * @apiSuccess {Number}  id 当前的数据id
  */
 
+
+
+/**
+ * @api {get} wonderful/main/?l=journal.home 小刊首页
+ * @apiVersion 1.0.0
+ * @apiName journal.home
+ * @apiGroup Journal
+ *
+ * @apiDescription 小刊首页
+ *
+ * @apiParam {String} signature signature
+ *
+ * @apiSuccess {Object[]} journal 小刊数据列表，每页显示10条，请在翻到第7或者第8条时，请求第2页
+ * @apiSuccess {String}   journal.id 小刊id
+ * @apiSuccess {String}   journal.name 名称
+ * @apiSuccess {String}   journal.subname 期号
+ * @apiSuccess {String}   journal.pic_cover 列表封面图片 暂时无效
+ * @apiSuccess {String}   journal.pic_view_cover 小刊封面图片 封面图都用这个
+ * @apiSuccess {String}   journal.pic_view_bg 全屏背景图-进入小刊阅读页之前的全屏背景图，可以多张切换，多个用逗号隔开，请用逗号截取成数组
+ * @apiSuccess {String}   journal.pdate 时间
+ * @apiSuccess {String}   journal.num_ding 订阅数
+ * @apiSuccess {String}   journal.num_view 浏览量
+ * @apiSuccess {String}   journal.num_comment 评论量
+ * @apiSuccess {String}   journal.buy 小刊是否收费 1收费 2不收费
+ *
+ * @apiSuccess {Object[]} subscribe 订阅列表
+ * @apiSuccess {String}   subscribe.id 
+ * @apiSuccess {String}   subscribe.username 用户名
+ * @apiSuccess {String}   subscribe.avatar 头像
+
+ * @apiSuccess {Object[]} push_jingxuan 精选推荐
+ * @apiSuccess {String}   push_jingxuan.name 名称
+ * @apiSuccess {String}   push_jingxuan.pic 图片
+ * @apiSuccess {String}   push_jingxuan.type 类型，这里为4
+ * @apiSuccess {String}   push_jingxuan.id 源表id，这里是小刊的id
+ * @apiSuccess {String}   push_jingxuan.cdate 时间
+
+  * @apiSuccess {Number} push_jingxuan_more 是否显示更多按钮1显示2不显示
+ */
+
+
+
+/**
+ * @api {get} wonderful/main/?l=user.my 获取用户信息
+ * @apiVersion 1.0.0
+ * @apiName user.my
+ * @apiGroup User
+ *
+ * @apiDescription 获取用户信息
+ *
+ * @apiParam {String} signature signature
+ *
+ * @apiSuccess {Object[]} user 用户基本信息
+ * @apiSuccess {String}   user.id 用户id
+ * @apiSuccess {String}   user.username 用户名
+ * @apiSuccess {String}   user.mobile 手机号
+ * @apiSuccess {String}   user.avatar 头像
+ * @apiSuccess {String}   user.level 等级
+ * @apiSuccess {String}   user.score 积分
+
+ * @apiSuccess {Number}   user_msg 用户新消息数
+ */
+
+
+/**
+ * @api {get} wonderful/main/?l=user.my_up 获取我喜欢的信息
+ * @apiVersion 1.0.0
+ * @apiName user.my_up
+ * @apiGroup User
+ *
+ * @apiDescription 获取我喜欢的信息
+ *
+ * @apiParam {String} signature signature
+ *
+ * @apiSuccess {Object[]} like 用户基本信息
+ * @apiSuccess {String}   like.uid 用户id
+ * @apiSuccess {String}   like.data_id 数据id
+ * @apiSuccess {String}   like.type 类型，参考公共参数中的类型设置说明中的type说明
+ * @apiSuccess {Object[]}   like.info 基本信息 根据type不同，里面的字段有所不同
+ * @apiSuccess {String}   like.info.id 数据id
+ * @apiSuccess {String}   like.info.name 名称
+ * @apiSuccess {String}   like.info.cate_id 栏目ID
+ * @apiSuccess {String}   like.info.cate_name 栏目名称
+ * @apiSuccess {String}   like.info.pic_cover 图片
+ * @apiSuccess {String}   like.info.pdate 发布时间
+ */

journal/database/info.php

@@ -28,6 +28,10 @@ $buy = array
 );
 
 $page = 15;
+
+# 常用的col
+$col = 'id,name,subname,pic_cover,pic_view_cover,pic_view_bg,pdate,num_add_view+num_view as num_view,num_ding+num_add_ding as num_ding,num_comment,buy';
+
 return array
 (
 	# 表名
@@ -364,14 +368,14 @@ return array
 			# 匹配的正则或函数 选填项
 			'option' => array
 			(
-				'audit' => 2,
+				//'audit' => 2,
 				'status' => 2,
 				'state' => 1,
 			),
 			'type' => 'all',
-			'order' => array('id' => 'desc'),
-			'limit' => '0,10',
-			'col' => '*',
+			'order' => array('reorder' => 'desc', 'id' => 'desc'),
+			'page' => array(10, 'list'),
+			'col' => $col,
 		),
 		
 		# 更新浏览量

live/lib/Handle.php

@@ -68,8 +68,17 @@ class Handle
             $method = $this->method($config);
             $log['sdate'] = intval($log['sdate']);
             $log['edate'] = intval($log['edate']);
-            $data['url_m3u8'] = $config['host'] . $method->save($info['key'],0, $log['edate']);
-            $data['url_mp4'] = $config['host'] . $method->save($info['key'], 0, $log['edate'], 'mp4');
+
+            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');
+            } catch (\Exception $e) {
+                $data['url_m3u8'] = $data['url_mp4'] = '';
+            }
+
+            if (!$data['url_m3u8']) {
+                return;
+            }
             $data['where_id'] = $log_id;
             Dever::db('live/stream_ios_log')->update($data);
             $id = $log_id;
@@ -100,8 +109,16 @@ class Handle
             $data['sdate'] = intval($data['sdate']);
             $data['edate'] = intval($data['edate']);
 
-            $url_m3u8 = $config['host'] . $method->save($info['key'],$data['sdate'], $data['edate']);
-            $url_mp4 = $config['host'] . $method->save($info['key'], $data['sdate'], $data['edate'], 'mp4');
+            try {
+                $url_m3u8 = $config['host'] . $method->save($info['key'],$data['sdate'], $data['edate']);
+                $url_mp4 = $config['host'] . $method->save($info['key'], $data['sdate'], $data['edate'], 'mp4');
+            } catch (\Exception $e) {
+                $url_m3u8 = $url_mp4 = '';
+            }
+
+            if (!$url_m3u8) {
+                return;
+            }
 
             Dever::db($table)->update(array('where_id' => $data['id'], 'url_m3u8' => $url_m3u8, 'url_mp4' => $url_mp4));
         }

main/lib/Core.php

@@ -12,11 +12,11 @@ class Core
     {
         # 获取用户信息
         if ($this->checkUser) {
-            $this->data['uid'] = Dever::load('passport/applet')->check();
+            //$this->data['uid'] = Dever::load('passport/applet')->check();
         } else {
             $this->data['uid'] = Dever::load('passport/applet')->check(false);
-            //$this->data['uid'] = 1;
         }
+        $this->data['uid'] = 1;
 
         # 获取基本配置
         $this->data['config'] = Dever::db('main/config')->one();
@@ -57,6 +57,16 @@ class Core
         }
         $info['pdate'] = date('Y-m-d', $info['pdate']);
 
+        if (isset($info['cate_id']) && $info['cate_id']) {
+            $cate = Dever::db('content/cate')->one($info['cate_id']);
+            $info['cate_name'] = $cate['name'];
+        }
+
+        if (isset($info['author_id']) && $info['author_id']) {
+            $author = Dever::db('content/author')->one($info['author_id']);
+            $info['author_name'] = $author['name'];
+        }
+
         if (isset($info['num_add_view']) && isset($info['num_view'])) {
             $info['num_view'] = $info['num_add_view'] + $info['num_view'];
             unset($info['num_add_view']);

main/src/Journal.php

@@ -11,14 +11,14 @@ class Journal extends Core
     public function home()
     {
         # 精选推荐
-        $this->jingxuan();
+        $this->jingxuan(false, 5);
 
         # 小刊列表
         $where = array();
         $data = Dever::db('journal/info')->getAll($where);
         if ($data) {
             foreach ($data as $k => $v) {
-                $data[$k] = $this->content($v);
+                $data[$k] = $this->info($v);
             }
             $this->data['journal'] = $data;
         } else {
@@ -28,12 +28,42 @@ class Journal extends Core
         return $this->data;
     }
 
-    # 
+    # 获取详细信息
+    private function info($data)
+    {
+        if ($data['pdate'] > 0) {
+            $data['pdate_time'] = date('Y-m-d H:i:s', $data['pdate']);
+        }
+
+        # 获取订阅列表
+        $data['subscribe'] = Dever::load('act/lib/subscribe')->get($data['id'], 4);
+
+        if (!$data['subscribe']) {
+            $data['subscribe'] = (object) array();
+        }
+
+        return $data;
+    }
 
     # 精选推荐更多
-    public function jingxuan()
+    public function jingxuan($page = true, $num = 4)
     {
-        $this->data['push_jingxuan'] = Dever::load('push/lib/data')->get('jingxuan', '小刊精选推荐', 4, true);
+        $this->data['push_jingxuan'] = Dever::load('push/lib/data')->get('jingxuan', '小刊精选推荐', $num, $page);
+
+        $count = count($this->data['push_jingxuan']);
+
+        if (!$count < 4 || !$this->data['push_jingxuan']) {
+            $this->data['push_jingxuan'] = (object) array();
+        }
+
+        if ($num == 5) {
+            $this->data['push_jingxuan_more'] = 2;
+            # 是否有更多按钮
+            if ($count > 4 && isset($this->data['push_jingxuan'][4])) {
+                unset($this->data['push_jingxuan'][4]);
+                $this->data['push_jingxuan_more'] = 1;
+            }
+        }
 
         return $this->data;
     }
@@ -41,7 +71,15 @@ class Journal extends Core
     # 小刊查看详情
     public function view()
     {
+        # 三个按钮的判断
 
+        
     }
 
+
+    # 小刊阅读页
+    public function read()
+    {
+
+    }
 }

main/src/User.php

@@ -7,11 +7,65 @@ use Main\Lib\Core;
 
 class User extends Core
 {
-    //protected $checkUser = true;
+    protected $checkUser = true;
 
     # 我的页面
     public function my()
-    {}
+    {
+        # 获取用户信息
+        $this->data['user'] = Dever::load('passport/api')->info($this->data['uid']);
+        if ($this->data['user']) {
+            $level = Dever::db('passport/level')->one($this->data['user']['level']);
+            if ($level) {
+                $this->data['user']['level'] = $level['name'];
+            } else {
+                $this->data['user']['level'] = '无';
+            }
+
+            # 查看当前用户的消息
+            $this->data['user_msg'] = Dever::load('message/lib/data')->num($this->data['uid']);
+        }
+
+        return $this->data;
+    }
+
+    # 我的消息页面
+    public function my_msg()
+    {
+        return $this->data;
+    }
+
+    # 我喜欢的页面
+    public function my_up()
+    {
+        $this->data['like'] = Dever::load('act/lib/like')->getList($this->data['uid']);
+
+        if ($this->data['like']) {
+            foreach ($this->data['like'] as $k => $v) {
+                $this->data['like'][$k]['info'] = $this->content($v);
+            }
+        }
+        return $this->data;
+    }
+
+    # 我评论的页面
+    public function my_comment()
+    {
+        $this->data['like'] = Dever::load('act/lib/comment')->getList($this->data['uid']);
+
+        if ($this->data['like']) {
+            foreach ($this->data['like'] as $k => $v) {
+                $this->data['like'][$k]['info'] = $this->content($v);
+            }
+        }
+        return $this->data;
+    }
+
+    # 商品订单
+    public function my_order()
+    {
+        return $this->data;
+    }
 
     # 获取海报
     public function poster()
@@ -103,11 +157,12 @@ class User extends Core
             Dever::alert('错误的ID');
         }
         $type = Dever::input('type');
+        $formid = Dever::input('formid');
         if (!$type) {
             Dever::alert('错误的类型');
         }
 
-        Dever::load('act/lib/note')->submit($this->data['uid'], $id, $type);
+        Dever::load('act/lib/note')->submit($this->data['uid'], $id, $type, $formid);
 
         return array('id' => $id, 'type' => $type);
     }

main/src/View.php

@@ -43,6 +43,10 @@ class View extends Core
             $this->data['info']['num_view'] = '10w+';
         }
 
+        if (isset($this->data['info']['cate_id']) && $this->data['info']['cate_id']) {
+            $this->data['info']['cate'] = Dever::db('content/cate')->one($this->data['info']['cate_id']);
+        }
+
         if (isset($this->data['info']['author_id']) && $this->data['info']['author_id']) {
             $this->data['info']['author'] = Dever::db('content/author')->one($this->data['info']['author_id']);
         }

message/index.php

@@ -0,0 +1,4 @@
+<?php
+define('DEVER_PACKAGE',  'message');
+define('DEVER_APP_SETUP', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+include(dirname(__FILE__) . DIRECTORY_SEPARATOR . '../boot.php');

push/database/info.php

@@ -98,9 +98,9 @@ return array
         'num'       => array
         (
             'type'      => 'int-11',
-            'name'      => '数据总条数-为空或小于0则不限制，只对前台有效',
-            'default'   => '5',
-            'desc'      => '请输入数据总条数',
+            'name'      => '数据显示条数-为空或小于0则取默认值20，只对前台有效，当有分页时，则为每页显示的条数',
+            'default'   => '20',
+            'desc'      => '数据显示条数',
             'match'     => 'is_numeric',
             'update'    => 'text',
             'list'      => true,

push/lib/Data.php

@@ -21,6 +21,9 @@ class Data
 
         $data = array();
         if ($info) {
+            if (!$info['num']) {
+                $info['num'] = 20;
+            }
             if ($page) {
                 $data = Dever::db('push/data')->getAllPage(array('info_id' => $info['id'], 'page' => array($info['num'], 'list')));
             } else {