diff --git a/app/admin/controller/liveroom/Index.php b/app/admin/controller/liveroom/Index.php new file mode 100644 index 0000000..469822b --- /dev/null +++ b/app/admin/controller/liveroom/Index.php @@ -0,0 +1,18 @@ +model = new LiveRoom(); + } + +} diff --git a/app/admin/controller/liveroom/Task.php b/app/admin/controller/liveroom/Task.php new file mode 100644 index 0000000..478020b --- /dev/null +++ b/app/admin/controller/liveroom/Task.php @@ -0,0 +1,19 @@ +model = new TaskModel(); + } + + +} diff --git a/app/admin/model/Ip.php b/app/admin/model/Ip.php index 73e274e..0cb62f2 100644 --- a/app/admin/model/Ip.php +++ b/app/admin/model/Ip.php @@ -13,7 +13,7 @@ class Ip extends TimeModel public static function getPageList($param = []) { $page = $param['page'] ?? 1; - $limit = $param['$limit'] ?? 10; + $limit = $param['limit'] ?? 10; $where = [['status', '=', 1]]; if (isset($param['keyword'])) { $where[] = ['ip', 'like', '%'.$param['keyword'].'%']; diff --git a/app/admin/model/LiveRoom.php b/app/admin/model/LiveRoom.php new file mode 100644 index 0000000..0193a00 --- /dev/null +++ b/app/admin/model/LiveRoom.php @@ -0,0 +1,27 @@ +count(); + $list = self::where($where)->field($field)->order($order)->page($page, $limit)->select(); + return ['data' => $list, 'count' => $count]; + } +} diff --git a/app/admin/model/Task.php b/app/admin/model/Task.php index f790190..66c0529 100644 --- a/app/admin/model/Task.php +++ b/app/admin/model/Task.php @@ -10,4 +10,19 @@ class Task extends TimeModel protected $deleteTime = 'delete_time'; protected $defaultSoftDelete = '0'; + + public static function getPageList($param = []): array + { + $page = $param['page'] ?? 1; + $limit = $param['limit'] ?? 10; + $where = [['status', '=', 1]]; + if (isset($param['keyword'])) { + $where[] = ['uuid', 'like', '%'.$param['keyword'].'%']; + } + $field = 'id, uuid, integral, duration'; + $order = 'id desc'; + $count = self::where($where)->count(); + $list = self::where($where)->field($field)->order($order)->page($page, $limit)->select(); + return ['data' => $list, 'count' => $count]; + } } diff --git a/app/admin/model/User.php b/app/admin/model/User.php index 4a0d22a..d1e4f36 100644 --- a/app/admin/model/User.php +++ b/app/admin/model/User.php @@ -18,8 +18,8 @@ class User extends TimeModel public static function getPageList($param = []) { $page = $param['page'] ?? 1; - $limit = $param['$limit'] ?? 10; - $where = ['status' => 1]; + $limit = $param['limit'] ?? 10; + $where = [['status', '=', 1]]; if (isset($param['keyword'])) { $where[] = ['nick_name', 'like', '%'.$param['keyword'].'%']; } diff --git a/app/api/controller/LiveRoom.php b/app/api/controller/LiveRoom.php new file mode 100644 index 0000000..47e2333 --- /dev/null +++ b/app/api/controller/LiveRoom.php @@ -0,0 +1,19 @@ +request->isPost()) { + return $this->renderError('不支持GET请求'); + } + $param = $this->request->post(); + $list = LiveRoomModel::getPageList($param); + return $this->renderSuccess(['list' => $list['data'], 'count' => $list['count']]); + } +} diff --git a/app/api/controller/Task.php b/app/api/controller/Task.php new file mode 100644 index 0000000..629ddb9 --- /dev/null +++ b/app/api/controller/Task.php @@ -0,0 +1,21 @@ +request->isPost()) { + return $this->renderError('不支持GET请求'); + } + $param = $this->request->post(); + $list = TaskModel::getPageList($param); + return $this->renderSuccess(['list' => $list['data'], 'count' => $list['count']]); + } + +} diff --git a/app/api/middleware/LcJWTAuth.php b/app/api/middleware/LcJWTAuth.php index dfbfabd..cac9137 100644 --- a/app/api/middleware/LcJWTAuth.php +++ b/app/api/middleware/LcJWTAuth.php @@ -2,6 +2,7 @@ namespace app\api\middleware; +use app\api\model\User; use app\api\service\LcJWTService; use app\Request; @@ -24,6 +25,8 @@ class LcJWTAuth return json(['code' => 401, 'msg' => 'token verification failed']); } + $request->uid = $claims->get('uid'); + $request->user_info = User::where('uid', $request->uid)->find(); return $next($request); } -} \ No newline at end of file +}