fix:优化auth权限,登录逻辑获取信息

app/common/library/Auth.php

@@ -13,8 +13,12 @@ declare(strict_types=1);
 namespace app\common\library;
 
 use app\common\model\system\UserLog;
+use Psr\SimpleCache\InvalidArgumentException;
 use system\Random;
 use support\Response;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 use think\facade\Cache;
 use app\common\model\system\User as UserModel;
 use Webman\Event\Event;
@@ -28,11 +32,16 @@ class Auth
      */
     public string $token;
 
+    /**
+     * 用户ID
+     */
+    public int $user_id = 0;
+
     /**
      * 用户数据
      * @var object|array
      */
-    public mixed $userData;
+    public mixed $userInfo;
 
     /**
      * 保活时间
@@ -79,9 +88,11 @@ class Auth
     /**
      * 用户注册
      * @param array $post
-     * @return bool
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     * @throws \think\db\exception\DbException
+     * @return false|Response
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws InvalidArgumentException
+     * @throws ModelNotFoundException
      */
     public function register(array $post)
     {
@@ -90,10 +101,8 @@ class Auth
             return false;
         }
 
-        /**
-         * 禁止批量注册
-         */
-        $where[] = ['create_ip', '=', ip2long(request()->getRealIp())];
+        // 禁止批量注册
+        $where[] = ['create_ip', '=', request()->getRealIp()];
         $where[] = ['create_time', '>', linux_extime(1)];
         $totalMax = UserModel::where($where)->count();
 
@@ -128,24 +137,24 @@ class Auth
                 $post['pwd'] = encryptPwd($post['pwd'], $post['salt']);
             }
 
-            $this->userData = UserModel::create($post);
-
-            return $this->responseToken($this->userData);
-
+            $user = UserModel::create($post);
         } catch (\Throwable $th) {
             $this->setError($th->getMessage());
             return false;
         }
+
+        return $this->responseToken($user);
     }
 
     /**
      * 用户检测登录
      * @param string $nickname
      * @param string $pwd
-     * @return mixed
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
+     * @return false|Response
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws InvalidArgumentException
+     * @throws ModelNotFoundException
      */
     public function login(string $nickname = '', string $pwd = '')
     {
@@ -155,36 +164,37 @@ class Auth
         } else {
             $where[] = ['mobile', '=', htmlspecialchars(trim($nickname))];
         }
-        $this->userData = UserModel::where($where)->find();
 
-        if (!empty($this->userData)) {
+        $user = UserModel::where($where)->find();
 
-            $uPwd = encryptPwd($pwd, $this->userData['salt']);
-            if ($this->userData['pwd'] !== $uPwd) {
+        if (!empty($user)) {
+
+            $uPwd = encryptPwd($pwd, $user['salt']);
+            if ($user['pwd'] !== $uPwd) {
 
                 $this->setError('用户名或密码错误');
-                UserLog::write($this->getError(), $this->userData->nickname, $this->userData->id);
+                UserLog::write($this->getError(), $user['nickname'], $user['id']);
                 return false;
             }
 
-            if (!$this->userData['status']) {
+            if (!$user['status']) {
                 $this->setError('用户异常或未审核，请联系管理员');
-                UserLog::write($this->getError(), $this->userData->nickname, $this->userData->id);
+                UserLog::write($this->getError(), $user['nickname'], $user['id']);
                 return false;
             }
 
             // 更新登录数据
-            $userUpdate = [
-                'id'          => $this->userData['id'],
+            $update = [
+                'id'          => $user['id'],
                 'login_time'  => time(),
                 'login_ip'    => request()->getRealIp(),
-                'login_count' => $this->userData['login_count'] + 1,
+                'login_count' => $user['login_count'] + 1,
             ];
 
-            if (UserModel::update($userUpdate)) {
-                Event::emit('userLoginSuccess', $this->userData);
-                UserLog::write('登录成功', $this->userData->nickname, $this->userData->id, 1);
-                return $this->responseToken($this->userData);
+            if (UserModel::update($update)) {
+                Event::emit('userLoginSuccess', $user);
+                UserLog::write('登录成功', $user['nickname'], $user['id'], 1);
+                return $this->responseToken($user);
             }
         }
 
@@ -195,9 +205,9 @@ class Auth
     /**
      * 验证是否登录
      * @return bool
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException|InvalidArgumentException
      */
     public function isLogin(): bool
     {
@@ -205,46 +215,67 @@ class Auth
         if (!$token) {
             return false;
         }
-        $uid = $this->checkToken($token);
 
-        if (!empty($uid)) {
-            $this->token = $token;
-            $this->userData = UserModel::with('group')->find($uid);
-            return true;
+        // 验证token
+        $user = $this->checkToken($token);
+        if (isset($user['id'])) {
+            $this->userInfo = UserModel::with('group')->find($user['id']);
+            if (!empty($this->userInfo)) {
+                $this->token = $token;
+                $this->user_id = $user['id'];
+                $this->refreshUserInfo($token, $this->userInfo);
+                return true;
+            }
         }
 
         return false;
     }
 
     /**
-     * 退出登录
-     * @return void
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * 获取用户信息
      */
-    public function logout()
+    public function getUserInfo()
     {
-        Cache::delete($this->token);
+        $token = $this->getToken();
+        if (!$token) {
+            return false;
+        }
+
+        // 获取用户信息
+        return $this->checkToken($token);
     }
 
     /**
      *
      * 返回前端令牌
-     * @param mixed $userData
+     * @param $user
      * @param bool $token
-     * @return mixed
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @return Response
+     * @throws InvalidArgumentException
      */
-    public function responseToken($userData, bool $token = false)
+    public function responseToken($user, bool $token = false): Response
     {
-        $this->token = $token ? $this->getToken() : $this->buildToken($userData['id']);
+        $this->token = $token ? $this->getToken() : $this->buildToken($user['id']);
         $response = response();
-        $response->cookie('uid', $userData['id'],$this->keepTime, '/');
-        $response->cookie('token', $this->token,$this->keepTime, '/');
-        $response->cookie('nickname', $userData['nickname'],$this->keepTime, '/');
-        Cache::set($this->token, $userData['id'], $this->keepTime);
-        Event::emit("userLoginSuccess", $userData);
+        $response->cookie('uid', $user['id'], $this->keepTime, '/');
+        $response->cookie('token', $this->token, $this->keepTime, '/');
+        $response->cookie('nickname', $user['nickname'], $this->keepTime, '/');
+        $this->refreshUserInfo($this->token, $user);
+        // 执行登录成功事件
+        Event::emit("userLoginSuccess", $user);
         return $response;
+    }
 
+    /**
+     * 刷新用户信息
+     * @param $token
+     * @param $user
+     * @return void
+     * @throws InvalidArgumentException
+     */
+    private function refreshUserInfo($token, $user): void
+    {
+        Cache::set($token, $user, $this->keepTime);
     }
 
     /**
@@ -260,7 +291,6 @@ class Auth
 
     /**
      * 获取token
-     * @return array|string|null
      */
     public function getToken($token = 'token')
     {
@@ -269,15 +299,20 @@ class Auth
 
     /**
      * 校验token
-     * @access protected
-     * @param $token
-     * @return void
-     * @throws \Psr\SimpleCache\InvalidArgumentException
      */
     public function checkToken($token)
     {
-        $user_id = Cache::get($token);
-        return $user_id ?? false;
+        return Cache::get($token);
+    }
+
+    /**
+     * 退出登录
+     * @return void
+     * @throws InvalidArgumentException
+     */
+    public function logout()
+    {
+        Cache::delete($this->token);
     }
 
     /**

app/common/library/ParseData.php

@@ -118,7 +118,7 @@ class ParseData
     }
 
     /**
-     * 自动补全图片
+     * cdn前缀
      * @access  public
      * @param string $image
      * @param $data