diff --git a/catch/system/controller/LoginLog.php b/catch/system/controller/LoginLog.php index 5b45351..5377313 100644 --- a/catch/system/controller/LoginLog.php +++ b/catch/system/controller/LoginLog.php @@ -1,4 +1,5 @@ paginate()); + return CatchResponse::paginate($log->getList()); } /** diff --git a/catch/system/model/LoginLog.php b/catch/system/model/LoginLog.php index 13ebf37..34829c9 100644 --- a/catch/system/model/LoginLog.php +++ b/catch/system/model/LoginLog.php @@ -1,21 +1,30 @@ catchSearch() + ->order('id', 'desc') + ->paginate(); + } +} diff --git a/catch/system/model/search/LoginLogSearch.php b/catch/system/model/search/LoginLogSearch.php new file mode 100644 index 0000000..de32308 --- /dev/null +++ b/catch/system/model/search/LoginLogSearch.php @@ -0,0 +1,21 @@ +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); + } +}