Merge pull request #8 from tlerbao/master
登录日志新增数据搜索功能，修改路由Path单词用反了的问题
This commit is contained in:
JaguarJack
GitHub
commit
db18e71906
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
|
||||
namespace catchAdmin\system\controller;
|
||||
|
||||
use catcher\base\CatchController;
|
||||
@ -17,7 +18,7 @@ class LoginLog extends CatchController
|
||||
*/
|
||||
public function list(Log $log)
|
||||
{
|
||||
return CatchResponse::paginate($log->paginate());
|
||||
return CatchResponse::paginate($log->getList());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -19,9 +19,9 @@ class SystemPermissionSeed extends Seeder
|
||||
|
||||
protected function getPermissions()
|
||||
{
|
||||
return array (
|
||||
return array(
|
||||
0 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 37,
|
||||
'permission_name' => '系统管理',
|
||||
'parent_id' => 0,
|
||||
@ -43,9 +43,9 @@ class SystemPermissionSeed extends Seeder
|
||||
'updated_at' => 1593044431,
|
||||
'deleted_at' => 0,
|
||||
'children' =>
|
||||
array (
|
||||
array(
|
||||
0 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 38,
|
||||
'permission_name' => '数据字典',
|
||||
'parent_id' => 37,
|
||||
@ -67,9 +67,9 @@ class SystemPermissionSeed extends Seeder
|
||||
'updated_at' => 1593044431,
|
||||
'deleted_at' => 0,
|
||||
'children' =>
|
||||
array (
|
||||
array(
|
||||
0 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 39,
|
||||
'permission_name' => '查看',
|
||||
'parent_id' => 38,
|
||||
@ -92,7 +92,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
1 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 40,
|
||||
'permission_name' => '列表',
|
||||
'parent_id' => 38,
|
||||
@ -115,7 +115,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
2 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 41,
|
||||
'permission_name' => '优化',
|
||||
'parent_id' => 38,
|
||||
@ -138,7 +138,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
3 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 42,
|
||||
'permission_name' => '备份',
|
||||
'parent_id' => 38,
|
||||
@ -163,7 +163,7 @@ class SystemPermissionSeed extends Seeder
|
||||
),
|
||||
),
|
||||
1 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 43,
|
||||
'permission_name' => '附件管理',
|
||||
'parent_id' => 37,
|
||||
@ -185,9 +185,9 @@ class SystemPermissionSeed extends Seeder
|
||||
'updated_at' => 1593044431,
|
||||
'deleted_at' => 0,
|
||||
'children' =>
|
||||
array (
|
||||
array(
|
||||
0 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 44,
|
||||
'permission_name' => '列表',
|
||||
'parent_id' => 43,
|
||||
@ -210,7 +210,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
1 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 45,
|
||||
'permission_name' => '删除',
|
||||
'parent_id' => 43,
|
||||
@ -233,7 +233,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
2 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 46,
|
||||
'permission_name' => '上传图片',
|
||||
'parent_id' => 43,
|
||||
@ -256,7 +256,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
3 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 47,
|
||||
'permission_name' => '上传文件',
|
||||
'parent_id' => 43,
|
||||
@ -281,7 +281,7 @@ class SystemPermissionSeed extends Seeder
|
||||
),
|
||||
),
|
||||
2 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 48,
|
||||
'permission_name' => '配置管理',
|
||||
'parent_id' => 37,
|
||||
@ -303,9 +303,9 @@ class SystemPermissionSeed extends Seeder
|
||||
'updated_at' => 1593044431,
|
||||
'deleted_at' => 0,
|
||||
'children' =>
|
||||
array (
|
||||
array(
|
||||
0 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 49,
|
||||
'permission_name' => '父级配置',
|
||||
'parent_id' => 48,
|
||||
@ -328,7 +328,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
1 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 50,
|
||||
'permission_name' => '存储',
|
||||
'parent_id' => 48,
|
||||
@ -351,7 +351,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
2 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 51,
|
||||
'permission_name' => '获取',
|
||||
'parent_id' => 48,
|
||||
@ -376,12 +376,12 @@ class SystemPermissionSeed extends Seeder
|
||||
),
|
||||
),
|
||||
3 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 52,
|
||||
'permission_name' => '登陆日志',
|
||||
'parent_id' => 37,
|
||||
'level' => '37',
|
||||
'route' => '/system/log/operate',
|
||||
'route' => '/system/log/login',
|
||||
'icon' => 'export',
|
||||
'module' => 'system',
|
||||
'creator_id' => 1,
|
||||
@ -398,9 +398,9 @@ class SystemPermissionSeed extends Seeder
|
||||
'updated_at' => 1593044431,
|
||||
'deleted_at' => 0,
|
||||
'children' =>
|
||||
array (
|
||||
array(
|
||||
0 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 53,
|
||||
'permission_name' => '列表',
|
||||
'parent_id' => 52,
|
||||
@ -423,7 +423,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
1 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 54,
|
||||
'permission_name' => '清空',
|
||||
'parent_id' => 52,
|
||||
@ -448,12 +448,12 @@ class SystemPermissionSeed extends Seeder
|
||||
),
|
||||
),
|
||||
4 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 55,
|
||||
'permission_name' => '操作日志',
|
||||
'parent_id' => 37,
|
||||
'level' => '37',
|
||||
'route' => '/system/log/login',
|
||||
'route' => '/system/log/operate',
|
||||
'icon' => 'profile',
|
||||
'module' => 'system',
|
||||
'creator_id' => 1,
|
||||
@ -470,9 +470,9 @@ class SystemPermissionSeed extends Seeder
|
||||
'updated_at' => 1593044431,
|
||||
'deleted_at' => 0,
|
||||
'children' =>
|
||||
array (
|
||||
array(
|
||||
0 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 56,
|
||||
'permission_name' => '列表',
|
||||
'parent_id' => 55,
|
||||
@ -495,7 +495,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
1 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 57,
|
||||
'permission_name' => '清空',
|
||||
'parent_id' => 55,
|
||||
@ -520,7 +520,7 @@ class SystemPermissionSeed extends Seeder
|
||||
),
|
||||
),
|
||||
5 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 58,
|
||||
'permission_name' => '代码生成',
|
||||
'parent_id' => 37,
|
||||
@ -542,9 +542,9 @@ class SystemPermissionSeed extends Seeder
|
||||
'updated_at' => 1593044431,
|
||||
'deleted_at' => 0,
|
||||
'children' =>
|
||||
array (
|
||||
array(
|
||||
0 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 59,
|
||||
'permission_name' => '生成',
|
||||
'parent_id' => 58,
|
||||
@ -567,7 +567,7 @@ class SystemPermissionSeed extends Seeder
|
||||
'deleted_at' => 0,
|
||||
),
|
||||
1 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 60,
|
||||
'permission_name' => '预览',
|
||||
'parent_id' => 58,
|
||||
@ -592,7 +592,7 @@ class SystemPermissionSeed extends Seeder
|
||||
),
|
||||
),
|
||||
6 =>
|
||||
array (
|
||||
array(
|
||||
'id' => 68,
|
||||
'permission_name' => '敏感词库',
|
||||
'parent_id' => 37,
|
||||
@ -616,6 +616,6 @@ class SystemPermissionSeed extends Seeder
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
<?php
|
||||
|
||||
namespace catchAdmin\system\model;
|
||||
|
||||
use catcher\traits\db\BaseOptionsTrait;
|
||||
use catchAdmin\system\model\search\LoginLogSearch;
|
||||
|
||||
class LoginLog extends \think\Model
|
||||
{
|
||||
use BaseOptionsTrait;
|
||||
use BaseOptionsTrait, LoginLogSearch;
|
||||
|
||||
protected $name = 'login_log';
|
||||
|
||||
@ -18,4 +20,11 @@ class LoginLog extends \think\Model
|
||||
'login_at', // 登录时间
|
||||
'status', // 1 成功 2 失败
|
||||
];
|
||||
|
||||
public function getList()
|
||||
{
|
||||
return $this->catchSearch()
|
||||
->order('id', 'desc')
|
||||
->paginate();
|
||||
}
|
||||
}
|
||||
21
catch/system/model/search/LoginLogSearch.php
Normal file
21
catch/system/model/search/LoginLogSearch.php
Normal file
@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
namespace catchAdmin\system\model\search;
|
||||
|
||||
trait LoginLogSearch
|
||||
{
|
||||
public function searchLoginNameAttr($query, $value, $data)
|
||||
{
|
||||
return $query->whereLike('login_name', $value);
|
||||
}
|
||||
|
||||
public function searchLoginIpAttr($query, $value, $data)
|
||||
{
|
||||
return $query->whereLike('login_ip', $value);
|
||||
}
|
||||
|
||||
public function searchLoginAtAttr($query, $value, $data)
|
||||
{
|
||||
return $query->whereTime('login_at', 'between', $value);
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user