Merge branch 'develop' of https://gitee.com/Tyssen/yi-shi into develop

Server/application/common/controller/Auth.php

@@ -53,8 +53,8 @@ class Auth extends Controller
     public function login()
     {
         // 获取登录参数
-        $params = Request::only(['username', 'password', 'is_encrypted']);
-        
+        $params = Request::only(['account', 'password', 'typeId']);
+
         // 参数验证
         $validate = validate('common/Auth');
         if (!$validate->scene('login')->check($params)) {
@@ -62,16 +62,14 @@ class Auth extends Controller
         }
         
         try {
-            // 判断密码是否已加密
-            $isEncrypted = isset($params['is_encrypted']) && $params['is_encrypted'] === true;
-            
             // 调用登录服务
             $result = $this->authService->login(
-                $params['username'],
+                $params['account'],
                 $params['password'],
-                Request::ip(),
-                $isEncrypted
+                $params['typeId'],
+                Request::ip()
             );
+
             return ResponseHelper::success($result, '登录成功');
         } catch (\Exception $e) {
             return ResponseHelper::error($e->getMessage());
@@ -85,7 +83,7 @@ class Auth extends Controller
     public function mobileLogin()
     {
         // 获取登录参数
-        $params = Request::only(['mobile', 'code', 'is_encrypted']);
+        $params = Request::only(['account', 'code', 'typeId']);
         
         // 参数验证
         $validate = validate('common/Auth');
@@ -99,7 +97,7 @@ class Auth extends Controller
             
             // 调用手机号登录服务
             $result = $this->authService->mobileLogin(
-                $params['mobile'],
+                $params['account'],
                 $params['code'],
                 Request::ip(),
                 $isEncrypted
@@ -118,7 +116,7 @@ class Auth extends Controller
     public function sendCode()
     {
         // 获取参数
-        $params = Request::only(['mobile', 'type']);
+        $params = Request::only(['account', 'type']);
         
         // 参数验证
         $validate = validate('common/Auth');
@@ -129,7 +127,7 @@ class Auth extends Controller
         try {
             // 调用发送验证码服务
             $result = $this->authService->sendLoginCode(
-                $params['mobile'],
+                $params['account'],
                 $params['type']
             );
             return ResponseHelper::success($result, '验证码发送成功');

Server/application/common/model/User.php

@@ -30,134 +30,148 @@ class User extends Model
      * 创建时间字段
      * @var string
      */
-    protected $createTime = 'create_at';
+    protected $createTime = 'createTime';
 
     /**
      * 更新时间字段
      * @var string
      */
-    protected $updateTime = 'update_at';
+    protected $updateTime = 'updateTime';
 
     /**
      * 软删除字段
      * @var string
      */
-    protected $deleteTime = 'delete_at';
+    protected $deleteTime = 'deleteTime';
 
     /**
      * 隐藏属性
      * @var array
      */
-    protected $hidden = ['password', 'delete_at'];
+    protected $hidden = ['passwordMd5', 'passwordLocal', 'deleteTime'];
+
+    /**
+     * 字段类型
+     * @var array
+     */
+    protected $type = [
+        'id' => 'integer',
+        'isAdmin' => 'integer',
+        'companyId' => 'integer',
+        'typeId' => 'integer',
+        'lastLoginTime' => 'integer',
+        'status' => 'integer',
+        'createTime' => 'integer',
+        'updateTime' => 'integer',
+        'deleteTime' => 'integer'
+    ];
 
     /**
      * 获取管理员用户信息
-     * @param string $username 用户名
+     * @param string $account 账号（手机号）
      * @param string $password 密码（可能是加密后的）
-     * @param bool $isEncrypted 密码是否已加密
+     * @param int $typeId 身份信息
      * @return array|null
      */
-    public static function getAdminUser($username, $password, $isEncrypted = false)
+    public static function getAdminUser($account, $password, $typeId)
     {
         // 查询用户
-        $user = self::where('username', $username)->find();
-        
+        $user = self::where('account', $account)
+                    ->where('typeId', $typeId)
+                    ->where('status', 1)
+                    ->find();
         if (!$user) {
             // 记录日志
-            \think\facade\Log::info('用户不存在', ['username' => $username]);
+            \think\facade\Log::info('用户不存在或已禁用', ['account' => $account]);
             return null;
         }
         
         // 记录密码验证信息
         \think\facade\Log::info('密码验证', [
-            'username' => $username,
+            'account' => $account,
             'input_password' => $password,
-            'stored_hash' => $user->password,
-            'is_encrypted' => $isEncrypted,
-            'password_info' => password_get_info($user->password)
+            'stored_hash' => $user->passwordMd5,
         ]);
         
         // 验证密码
-        $isValid = false;
-        
-        if ($isEncrypted) {
-            // 前端已加密，直接比较哈希值
-            // 注意：这里需要确保前端和后端使用相同的加密算法和盐值
-            $storedHash = self::getStoredHash($user->password);
-            $isValid = hash_equals($storedHash, $password);
-            
-            \think\facade\Log::info('加密密码验证', [
-                'username' => $username,
-                'stored_hash' => $storedHash,
-                'input_hash' => $password,
-                'is_valid' => $isValid
-            ]);
-        } else {
-            // 未加密，使用password_verify验证
-            $isValid = password_verify($password, $user->password);
-        }
-        
+        $isValid = password_verify($password, $user->passwordMd5);
+
         \think\facade\Log::info('密码验证结果', [
-            'username' => $username,
+            'account' => $account,
             'is_valid' => $isValid,
-            'is_encrypted' => $isEncrypted
         ]);
         
         if (!$isValid) {
             return null;
         }
         
+        // 更新登录信息
+        $user->lastLoginIp = request()->ip();
+        $user->lastLoginTime = time();
+        $user->save();
+        
+        // 用手机号当做默认用户名（如果没有设置用户名）
+        $username = $user->username ?: $user->account;
+        
         return [
             'id' => $user->id,
-            'username' => $user->username,
-            'name' => $user->username, // 暂时使用username作为name
-            'role' => 'admin', // 暂时固定为admin角色
-            'permissions' => ['*'], // 暂时拥有所有权限
+            'username' => $username,
+            'account' => $user->account,
+            'avatar' => $user->avatar,
+            'isAdmin' => $user->isAdmin,
+            'companyId' => $user->companyId,
+            'typeId' => $user->typeId,
+            'lastLoginIp' => $user->lastLoginIp,
+            'lastLoginTime' => $user->lastLoginTime
         ];
     }
 
-    /**
-     * 获取存储的哈希值
-     * 用于前端加密密码的验证
-     * @param string $bcryptHash 数据库中存储的bcrypt哈希值
-     * @return string 用于前端验证的哈希值
-     */
-    protected static function getStoredHash($bcryptHash)
-    {
-        // 这里需要实现与前端相同的加密算法
-        // 例如，如果前端使用SHA256加盐，这里需要提取原始密码并进行相同的处理
-        // 注意：这只是一个示例，实际实现可能需要根据您的具体需求调整
-        
-        // 假设我们能够从bcrypt哈希中提取原始密码（实际上这是不可能的，这里只是示例）
-        // 在实际应用中，您需要在用户注册或修改密码时同时存储前端加密的哈希值
-        $originalPassword = '123456'; // 这里应该是从数据库中获取的原始密码
-        $salt = 'yishi_salt_2024'; // 与前端相同的盐值
-        
-        // 使用与前端相同的算法
-        return hash('sha256', $originalPassword . $salt);
-    }
-
     /**
      * 通过手机号获取用户信息
-     * @param string $mobile 手机号
+     * @param string $account 手机号
      * @return array|null
      */
-    public static function getUserByMobile($mobile)
+    public static function getUserByMobile($account)
     {
         // 查询用户
-        $user = self::where('mobile', $mobile)->find();
+        $user = self::where('account', $account)
+                    ->where('status', 1)
+                    ->find();
         
         if (!$user) {
             return null;
         }
         
+        // 用手机号当做默认用户名（如果没有设置用户名）
+        $username = $user->username ?: $user->account;
+        // 默认头像地址
+        $avatar = $user->avatar ?: '';
+        
         return [
             'id' => $user->id,
-            'username' => $user->username,
-            'name' => $user->username, // 暂时使用username作为name
-            'mobile' => $user->mobile,
-            'role' => 'user', // 暂时固定为user角色
-            'permissions' => ['user'], // 暂时拥有用户权限
+            'username' => $username,
+            'account' => $user->account,
+            'avatar' => $avatar,
+            'isAdmin' => $user->isAdmin,
+            'companyId' => $user->companyId,
+            'typeId' => $user->typeId,
+            'lastLoginIp' => $user->lastLoginIp,
+            'lastLoginTime' => $user->lastLoginTime
         ];
     }
+    
+    /**
+     * 验证用户密码
+     * @param string $password 密码
+     * @param bool $isEncrypted 是否已加密
+     * @return bool
+     */
+    public function verifyPassword($password, $isEncrypted = false)
+    {
+        if ($isEncrypted) {
+            return hash_equals($this->passwordMd5, $password);
+        } else {
+            return $this->passwordMd5 === md5($password);
+        }
+    }
 } 

Server/application/common/service/AuthService.php

@@ -31,22 +31,21 @@ class AuthService
 
     /**
      * 用户登录
-     * @param string $username 用户名
+     * @param string $account 账号（手机号）
      * @param string $password 密码（可能是加密后的）
      * @param string $ip 登录IP
-     * @param bool $isEncrypted 密码是否已加密
      * @return array
      * @throws \Exception
      */
-    public function login($username, $password, $ip, $isEncrypted = false)
+    public function login($account, $password, $typeId, $ip)
     {
         // 获取用户信息
-        $user = User::getAdminUser($username, $password, $isEncrypted);
-        
+        $user = User::getAdminUser($account, $password, $typeId);
+
         if (empty($user)) {
             // 记录登录失败
-            Log::info('登录失败', ['username' => $username, 'ip' => $ip, 'is_encrypted' => $isEncrypted]);
-            throw new \Exception('用户名或密码错误');
+            Log::info('登录失败', ['account' => $account, 'ip' => $ip, 'is_encrypted' => true]);
+            throw new \Exception('账号或密码错误');
         }
         
         // 生成JWT令牌
@@ -54,7 +53,7 @@ class AuthService
         $expireTime = time() + self::TOKEN_EXPIRE;
         
         // 记录登录成功
-        Log::info('登录成功', ['username' => $username, 'ip' => $ip]);
+        Log::info('登录成功', ['account' => $account, 'ip' => $ip]);
         
         return [
             'token' => $token,
@@ -65,25 +64,25 @@ class AuthService
 
     /**
      * 手机号验证码登录
-     * @param string $mobile 手机号
+     * @param string $account 手机号
      * @param string $code 验证码（可能是加密后的）
      * @param string $ip 登录IP
      * @param bool $isEncrypted 验证码是否已加密
      * @return array
      * @throws \Exception
      */
-    public function mobileLogin($mobile, $code, $ip, $isEncrypted = false)
+    public function mobileLogin($account, $code, $ip, $isEncrypted = false)
     {
         // 验证验证码
-        if (!$this->smsService->verifyCode($mobile, $code, 'login', $isEncrypted)) {
-            Log::info('验证码验证失败', ['mobile' => $mobile, 'ip' => $ip, 'is_encrypted' => $isEncrypted]);
+        if (!$this->smsService->verifyCode($account, $code, 'login', $isEncrypted)) {
+            Log::info('验证码验证失败', ['account' => $account, 'ip' => $ip, 'is_encrypted' => $isEncrypted]);
             throw new \Exception('验证码错误或已过期');
         }
 
         // 获取用户信息
-        $user = User::getUserByMobile($mobile);
+        $user = User::getUserByMobile($account);
         if (empty($user)) {
-            Log::info('用户不存在', ['mobile' => $mobile, 'ip' => $ip]);
+            Log::info('用户不存在', ['account' => $account, 'ip' => $ip]);
             throw new \Exception('用户不存在');
         }
 
@@ -92,7 +91,7 @@ class AuthService
         $expireTime = time() + self::TOKEN_EXPIRE;
 
         // 记录登录成功
-        Log::info('手机号登录成功', ['mobile' => $mobile, 'ip' => $ip]);
+        Log::info('手机号登录成功', ['account' => $account, 'ip' => $ip]);
 
         return [
             'token' => $token,
@@ -103,14 +102,14 @@ class AuthService
 
     /**
      * 发送登录验证码
-     * @param string $mobile 手机号
+     * @param string $account 手机号
      * @param string $type 验证码类型
      * @return array
      * @throws \Exception
      */
-    public function sendLoginCode($mobile, $type)
+    public function sendLoginCode($account, $type)
     {
-        return $this->smsService->sendCode($mobile, $type);
+        return $this->smsService->sendCode($account, $type);
     }
 
     /**

Server/application/common/validate/Auth.php

@@ -13,12 +13,10 @@ class Auth extends Validate
      * @var array
      */
     protected $rule = [
-        'username' => 'require|length:3,20',
+        'account' => 'require|mobile',
         'password' => 'require|length:6,64',
-        'mobile' => 'require|mobile',
         'code' => 'require|length:4,6',
-        'is_encrypted' => 'boolean',
-        'type' => 'require|in:login,register',
+        'typeId' => 'require|in:1,2',
     ];
 
     /**
@@ -26,17 +24,14 @@ class Auth extends Validate
      * @var array
      */
     protected $message = [
-        'username.require' => '用户名不能为空',
-        'username.length' => '用户名长度必须在3-20个字符之间',
+        'account.require' => '账号不能为空',
+        'account.mobile' => '账号格式不正确（需要是手机号）',
         'password.require' => '密码不能为空',
         'password.length' => '密码长度必须在6-64个字符之间',
-        'mobile.require' => '手机号不能为空',
-        'mobile.mobile' => '手机号格式不正确',
         'code.require' => '验证码不能为空',
         'code.length' => '验证码长度必须在4-6个字符之间',
-        'is_encrypted.boolean' => '加密标志必须为布尔值',
-        'type.require' => '验证码类型不能为空',
-        'type.in' => '验证码类型不正确',
+        'typeId.require' => '用户类型不能为空',
+        'typeId.in' => '用户类型错误',
     ];
 
     /**
@@ -44,9 +39,9 @@ class Auth extends Validate
      * @var array
      */
     protected $scene = [
-        'login' => ['username', 'password', 'is_encrypted'],
-        'mobile_login' => ['mobile', 'code', 'is_encrypted'],
+        'login' => ['account', 'password', 'typeId'],
+        'mobile_login' => ['account', 'code', 'typeId'],
         'refresh' => [],
-        'send_code' => ['mobile', 'type'],
+        'send_code' => ['account', 'type'],
     ];
 }