Skip to content

Commit 8166437

Browse files
lisgrouplisgroup
committed
chore: Defining a unified approach to get perPage 
1 parent 38bfb29 commit 8166437

14 files changed

+39
-106
lines changed

‎laravel/app/Http/Controllers/Api/ApiExcelController.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function __construct(Request $request)
4545
*
4646
* @return \Illuminate\Http\Response
4747
*/
48-
public function index(Request $request)
48+
public function index()
4949
{
5050
$user_id = auth('api')->user()['id'];
5151

@@ -54,8 +54,7 @@ public function index(Request $request)
5454
if ($user_id != 1) {
5555
$where = ['uid' => $user_id];
5656
}
57-
$perPage = intval($request->input('perPage'));
58-
$perPage = $perPage ?? 20;
57+
$perPage = $this->getPerPage();
5958
$list = ApiExcel::with('apiParam')->where($where)->orderBy('id', 'desc')->paginate($perPage);
6059
// 获取完成进度情况
6160
$list = ApiRepository::getInstent()->workProgress($list);

‎laravel/app/Http/Controllers/Api/ApiParamController.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use App\Http\Requests\ApiParam\Update;
77
use App\Models\ApiParam;
88
use App\Http\Controllers\Controller;
9-
use Illuminate\Http\Request;
109

1110
class ApiParamController extends Controller
1211
{
@@ -21,7 +20,7 @@ class ApiParamController extends Controller
2120
*
2221
* @return void
2322
*/
24-
public function __construct(Request $request)
23+
public function __construct()
2524
{
2625
// 这里额外注意了：官方文档样例中只除外了『login』
2726
// 这样的结果是，token 只能在有效期以内进行刷新，过期无法刷新
@@ -37,10 +36,9 @@ public function __construct(Request $request)
3736
*
3837
* @return \Illuminate\Http\Response
3938
*/
40-
public function index(Request $request)
39+
public function index()
4140
{
42-
$perPage = intval($request->input('perPage'));
43-
$perPage = $perPage ?? 20;
41+
$perPage = $this->getPerPage();
4442
$list = ApiParam::orderBy('id', 'desc')->paginate($perPage);
4543
return $this->out(200, $list);
4644
}

‎laravel/app/Http/Controllers/Api/ArticleController.php‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,16 @@
66
use App\Http\Requests\Article\Update;
77
use App\Models\Article;
88
use App\Http\Controllers\Controller;
9-
use Illuminate\Http\Request;
109

1110
class ArticleController extends Controller
1211
{
13-
/**
14-
* @var int 默认分页条数
15-
*/
16-
public $perPage = 10;
17-
1812
/**
1913
* Create a new AuthController instance.
2014
* 要求附带email和password（数据来源users表）
2115
*
2216
* @return void
2317
*/
24-
public function __construct(Request $request)
18+
public function __construct()
2519
{
2620
// 这里额外注意了：官方文档样例中只除外了『login』
2721
// 这样的结果是，token 只能在有效期以内进行刷新，过期无法刷新
@@ -30,9 +24,6 @@ public function __construct(Request $request)
3024
$this->middleware(['auth:api', 'role']);
3125
// 另外关于上面的中间件，官方文档写的是『auth:api』
3226
// 但是我推荐用 『jwt.auth』，效果是一样的，但是有更加丰富的报错信息返回
33-
34-
$perPage = intval($request->input('perPage'));
35-
$this->perPage = $perPage ?? 11;
3627
}
3728

3829
/**
@@ -42,7 +33,7 @@ public function __construct(Request $request)
4233
*/
4334
public function index()
4435
{
45-
$list = Article::orderBy('id', 'DESC')->select('id', 'title', 'author', 'keywords', 'created_at')->paginate($this->perPage);
36+
$list = Article::orderBy('id', 'DESC')->select('id', 'title', 'author', 'keywords', 'created_at')->paginate($this->getPerPage());
4637
return $this->out(200, $list);
4738
}
4839

‎laravel/app/Http/Controllers/Api/CategoryController.php‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,13 @@
1010

1111
class CategoryController extends Controller
1212
{
13-
/**
14-
* @var int 默认分页条数
15-
*/
16-
public $perPage = 10;
17-
1813
/**
1914
* Create a new AuthController instance.
2015
* 要求附带email和password（数据来源users表）
2116
*
2217
* @return void
2318
*/
24-
public function __construct(Request $request)
19+
public function __construct()
2520
{
2621
// 这里额外注意了：官方文档样例中只除外了『login』
2722
// 这样的结果是，token 只能在有效期以内进行刷新，过期无法刷新
@@ -30,9 +25,6 @@ public function __construct(Request $request)
3025
$this->middleware(['auth:api', 'role']);
3126
// 另外关于上面的中间件，官方文档写的是『auth:api』
3227
// 但是我推荐用 『jwt.auth』，效果是一样的，但是有更加丰富的报错信息返回
33-
34-
$perPage = intval($request->input('perPage'));
35-
$this->perPage = $perPage ?? 11;
3628
}
3729

3830
/**
@@ -42,7 +34,7 @@ public function __construct(Request $request)
4234
*/
4335
public function index()
4436
{
45-
$list = Category::orderBy('sort')->paginate($this->perPage);
37+
$list = Category::orderBy('sort')->paginate($this->getPerPage());
4638
return $this->out(200, $list);
4739
}
4840

@@ -95,7 +87,7 @@ public function show(Category $Category)
9587
* Show the form for editing the specified resource.
9688
* 编辑展示数据
9789
*
98-
* @param int $id
90+
* @param int $id
9991
*
10092
* @return \Illuminate\Http\Response
10193
*/
@@ -109,8 +101,8 @@ public function edit($id)
109101
* Update the specified resource in storage.
110102
* 更新数据
111103
*
112-
* @param Update $request
113-
* @param int $id
104+
* @param Update $request
105+
* @param int $id
114106
* @return \Illuminate\Http\Response
115107
*/
116108
public function update(Update $request, $id)
@@ -130,7 +122,7 @@ public function update(Update $request, $id)
130122
/**
131123
* Remove the specified resource from storage.
132124
*
133-
* @param int $id
125+
* @param int $id
134126
* @return \Illuminate\Http\Response
135127
* @throws \Exception
136128
*/

‎laravel/app/Http/Controllers/Api/ConfigController.php‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99

1010
class ConfigController extends Controller
1111
{
12-
/**
13-
* @var int 默认分页条数
14-
*/
15-
public $perPage = 10;
16-
1712
private $allow = ['name', 'title', 'default_open', 'state'];
1813

1914
/**
@@ -22,7 +17,7 @@ class ConfigController extends Controller
2217
*
2318
* @return void
2419
*/
25-
public function __construct(Request $request)
20+
public function __construct()
2621
{
2722
// 这里额外注意了：官方文档样例中只除外了『login』
2823
// 这样的结果是，token 只能在有效期以内进行刷新，过期无法刷新
@@ -31,9 +26,6 @@ public function __construct(Request $request)
3126
$this->middleware(['auth:api', 'role']);
3227
// 另外关于上面的中间件，官方文档写的是『auth:api』
3328
// 但是我推荐用 『jwt.auth』，效果是一样的，但是有更加丰富的报错信息返回
34-
35-
$perPage = intval($request->input('perPage'));
36-
$this->perPage = $perPage ?? 11;
3729
}
3830

3931
/**

‎laravel/app/Http/Controllers/Api/CronTaskController.php‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010

1111
class CronTaskController extends Controller
1212
{
13-
/**
14-
* @var int 默认分页条数
15-
*/
16-
public $perPage = 11;
17-
1813
/**
1914
* Create a new AuthController instance.
2015
* 要求附带email和password（数据来源users表）
@@ -30,8 +25,6 @@ public function __construct(Request $request)
3025
$this->middleware(['auth:api', 'role']);
3126
// 另外关于上面的中间件，官方文档写的是『auth:api』
3227
// 但是我推荐用 『jwt.auth』，效果是一样的，但是有更加丰富的报错信息返回
33-
$perPage = intval($request->input('perPage'));
34-
$this->perPage = $perPage ?? 11;
3528
}
3629

3730
/**
@@ -41,7 +34,7 @@ public function __construct(Request $request)
4134
*/
4235
public function index()
4336
{
44-
$list = CronTask::paginate($this->perPage);
37+
$list = CronTask::paginate($this->getPerPage());
4538
return $this->out(200, $list);
4639
}
4740

‎laravel/app/Http/Controllers/Api/IndexController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class IndexController extends Controller
1616
*
1717
* @param Request $request
1818
*/
19-
public function __construct(Request $request)
19+
public function __construct()
2020
{
2121
// 这里额外注意了：官方文档样例中只除外了『login』
2222
// 这样的结果是，token 只能在有效期以内进行刷新，过期无法刷新

‎laravel/app/Http/Controllers/Api/LinesController.php‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,13 @@
1010

1111
class LinesController extends Controller
1212
{
13-
/**
14-
* @var int 默认分页条数
15-
*/
16-
public $perPage = 10;
17-
1813
/**
1914
* Create a new AuthController instance.
2015
* 要求附带email和password（数据来源users表）
2116
*
2217
* @return void
2318
*/
24-
public function __construct(Request $request)
19+
public function __construct()
2520
{
2621
// 这里额外注意了：官方文档样例中只除外了『login』
2722
// 这样的结果是，token 只能在有效期以内进行刷新，过期无法刷新
@@ -30,9 +25,6 @@ public function __construct(Request $request)
3025
$this->middleware(['auth:api', 'role']);
3126
// 另外关于上面的中间件，官方文档写的是『auth:api』
3227
// 但是我推荐用 『jwt.auth』，效果是一样的，但是有更加丰富的报错信息返回
33-
34-
$perPage = intval($request->input('perPage'));
35-
$this->perPage = $perPage ?? 11;
3628
}
3729

3830
/**
@@ -42,7 +34,7 @@ public function __construct(Request $request)
4234
*/
4335
public function index()
4436
{
45-
$list = Line::paginate($this->perPage);
37+
$list = Line::paginate($this->getPerPage());
4638
return $this->out(200, $list);
4739
}
4840

‎laravel/app/Http/Controllers/Api/NavController.php‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,16 @@
66
use App\Http\Requests\Nav\Update;
77
use App\Models\Nav;
88
use App\Http\Controllers\Controller;
9-
use Illuminate\Http\Request;
109

1110
class NavController extends Controller
1211
{
13-
/**
14-
* @var int 默认分页条数
15-
*/
16-
public $perPage = 10;
17-
1812
/**
1913
* Create a new AuthController instance.
2014
* 要求附带email和password（数据来源users表）
2115
*
2216
* @return void
2317
*/
24-
public function __construct(Request $request)
18+
public function __construct()
2519
{
2620
// 这里额外注意了：官方文档样例中只除外了『login』
2721
// 这样的结果是，token 只能在有效期以内进行刷新，过期无法刷新
@@ -30,9 +24,6 @@ public function __construct(Request $request)
3024
$this->middleware(['auth:api', 'role']);
3125
// 另外关于上面的中间件，官方文档写的是『auth:api』
3226
// 但是我推荐用 『jwt.auth』，效果是一样的，但是有更加丰富的报错信息返回
33-
34-
$perPage = intval($request->input('perPage'));
35-
$this->perPage = $perPage ?? 11;
3627
}
3728

3829
/**
@@ -42,7 +33,7 @@ public function __construct(Request $request)
4233
*/
4334
public function index()
4435
{
45-
$list = Nav::orderBy('sort')->paginate($this->perPage);
36+
$list = Nav::orderBy('sort')->paginate($this->getPerPage());
4637
return $this->out(200, $list);
4738
}
4839

‎laravel/app/Http/Controllers/Api/PermissionController.php‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,13 @@
77
use App\Http\Requests\Permission\Update;
88
use App\Permission;
99
use App\Role;
10-
use Illuminate\Http\Request;
1110

1211

1312
class PermissionController extends Controller
1413
{
15-
16-
/**
17-
* @var int 默认分页条数
18-
*/
19-
public $perPage = 10;
20-
21-
public function __construct(Request $request)
14+
public function __construct()
2215
{
2316
$this->middleware(['auth:api', 'role']); // role 中间件让具备指定权限的用户才能访问该资源
24-
25-
$perPage = intval($request->input('perPage'));
26-
$this->perPage = $perPage ?? 11;
2717
}
2818

2919
/**
@@ -33,7 +23,7 @@ public function __construct(Request $request)
3323
*/
3424
public function index()
3525
{
36-
$list = Permission::paginate($this->perPage);
26+
$list = Permission::paginate($this->getPerPage());
3727
return $this->out(200, $list);
3828
}
3929

0 commit comments

Comments
 (0)