From 6e1691d8bc1a1f1724040973a4c37f9c86bbec8d Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Tue, 25 Feb 2025 15:23:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9user=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=A8=A1=E5=9E=8B=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/Login.php                  | 10 +++++-----
 app/admin/model/v1/SysUserLoginLogModel.php        | 14 ++++++++++++++
 .../model/v1/{UserModel.php => SysUserModel.php}   |  4 ++--
 app/admin/model/v1/UserLoginLogModel.php           | 14 --------------
 .../{UserBaseModel.php => SysUserBaseModel.php}    |  2 +-
 ...gBaseModel.php => SysUserLoginLogBaseModel.php} |  2 +-
 .../migrations/20241230054930_create_sys_user.php  |  1 +
 7 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 app/admin/model/v1/SysUserLoginLogModel.php
 rename app/admin/model/v1/{UserModel.php => SysUserModel.php} (81%)
 delete mode 100644 app/admin/model/v1/UserLoginLogModel.php
 rename app/common/model/{UserBaseModel.php => SysUserBaseModel.php} (94%)
 rename app/common/model/{UserLoginLogBaseModel.php => SysUserLoginLogBaseModel.php} (91%)

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 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\model\v1;
+
+use app\common\model\SysUserLoginLogBaseModel;
+
+/**
+ * @mixin \think\Model
+ */
+class SysUserLoginLogModel extends SysUserLoginLogBaseModel
+{
+
+}
diff --git a/app/admin/model/v1/UserModel.php b/app/admin/model/v1/SysUserModel.php
similarity index 81%
rename from app/admin/model/v1/UserModel.php
rename to app/admin/model/v1/SysUserModel.php
index dee398d7..c16c9dd5 100644
--- a/app/admin/model/v1/UserModel.php
+++ b/app/admin/model/v1/SysUserModel.php
@@ -3,12 +3,12 @@ declare (strict_types = 1);
 
 namespace app\admin\model\v1;
 
-use app\common\model\UserBaseModel;
+use app\common\model\SysUserBaseModel;
 
 /**
  * @mixin \think\Model
  */
-class UserModel extends UserBaseModel
+class SysUserModel extends SysUserBaseModel
 {
     // 隐藏字段
     protected $hidden = ['password', 'salt'];
diff --git a/app/admin/model/v1/UserLoginLogModel.php b/app/admin/model/v1/UserLoginLogModel.php
deleted file mode 100644
index 8b01c41b..00000000
--- a/app/admin/model/v1/UserLoginLogModel.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\admin\model\v1;
-
-use app\common\model\UserLoginLogBaseModel;
-
-/**
- * @mixin \think\Model
- */
-class UserLoginLogModel extends UserLoginLogBaseModel
-{
-
-}
diff --git a/app/common/model/UserBaseModel.php b/app/common/model/SysUserBaseModel.php
similarity index 94%
rename from app/common/model/UserBaseModel.php
rename to app/common/model/SysUserBaseModel.php
index 8f0e22a1..5da2b2c8 100644
--- a/app/common/model/UserBaseModel.php
+++ b/app/common/model/SysUserBaseModel.php
@@ -8,7 +8,7 @@ use think\Model;
 /**
  * @mixin \think\Model
  */
-class UserBaseModel extends Model
+class SysUserBaseModel extends Model
 {
     // 表名
     protected $name = 'sys_user';
diff --git a/app/common/model/UserLoginLogBaseModel.php b/app/common/model/SysUserLoginLogBaseModel.php
similarity index 91%
rename from app/common/model/UserLoginLogBaseModel.php
rename to app/common/model/SysUserLoginLogBaseModel.php
index 72593454..5988b491 100644
--- a/app/common/model/UserLoginLogBaseModel.php
+++ b/app/common/model/SysUserLoginLogBaseModel.php
@@ -8,7 +8,7 @@ use think\Model;
 /**
  * @mixin \think\Model
  */
-class UserLoginLogBaseModel extends Model
+class SysUserLoginLogBaseModel extends Model
 {
     // 表名
     protected $name = 'sys_user_login_log';
diff --git a/database/migrations/20241230054930_create_sys_user.php b/database/migrations/20241230054930_create_sys_user.php
index 9d91f3c0..d5944be9 100644
--- a/database/migrations/20241230054930_create_sys_user.php
+++ b/database/migrations/20241230054930_create_sys_user.php
@@ -39,6 +39,7 @@ class CreateSysUser extends Migrator
             ->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();
     }
 }