diff --git a/app/admin/controller/v1/Login.php b/app/admin/controller/v1/Login.php index fab1e281..2e7cfce8 100644 --- a/app/admin/controller/v1/Login.php +++ b/app/admin/controller/v1/Login.php @@ -4,8 +4,8 @@ declare (strict_types = 1); namespace app\admin\controller\v1; use app\admin\exception\InvalidLoginException; -use app\admin\model\v1\UserLoginLogModel; -use app\admin\model\v1\UserModel; +use app\admin\model\v1\SysUserLoginLogModel; +use app\admin\model\v1\SysUserModel; use app\admin\validate\v1\LoginValidate; use thans\jwt\facade\JWTAuth; use think\facade\Cache; @@ -28,7 +28,7 @@ class Login 'captcha' ]); - $user = new UserModel(); + $user = new SysUserModel(); $msg = ''; try { // 验证参数 @@ -50,7 +50,7 @@ class Login } // 验证用户 - $user = UserModel::usernameOrMobile($post['username'])->find(); + $user = SysUserModel::usernameOrMobile($post['username'])->find(); if (!$user) { throw new InvalidLoginException('用户不存在'); } @@ -73,7 +73,7 @@ class Login } // 记录登录日志 - UserLoginLogModel::create([ + SysUserLoginLogModel::create([ 'user_id' => $user['id'], 'ip' => ip2long(request()->ip()), 'user_agent' => request()->header('user-agent'), diff --git a/app/admin/model/v1/SysUserLoginLogModel.php b/app/admin/model/v1/SysUserLoginLogModel.php new file mode 100644 index 00000000..47ca5a6b --- /dev/null +++ b/app/admin/model/v1/SysUserLoginLogModel.php @@ -0,0 +1,14 @@ +addColumn('status', 'boolean', ['null' => false, 'default' => 1, 'comment' => '-1为禁用, 1为启用']) ->addColumn('created_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP', 'comment' => '创建时间']) ->addColumn('updated_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'comment' => '更新时间']) + ->addColumn('deleted_at', 'timestamp', ['null' => true, 'default' => null, 'comment' => '删除时间']) ->create(); } }