From 50c8470d7378e199e64ceb36107ad29cd52a9987 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Mon, 22 Feb 2021 08:52:39 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BC=98=E5=8C=96auth?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/catcher/CatchAuth.php | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/extend/catcher/CatchAuth.php b/extend/catcher/CatchAuth.php
index b1d742e..ae679a7 100644
--- a/extend/catcher/CatchAuth.php
+++ b/extend/catcher/CatchAuth.php
@@ -8,7 +8,6 @@ use catcher\exceptions\FailedException;
 use catcher\exceptions\LoginFailedException;
 use thans\jwt\facade\JWTAuth;
 use think\facade\Session;
-use think\helper\Str;
 
 class CatchAuth
 {
@@ -65,26 +64,20 @@ class CatchAuth
      */
     public function attempt($condition)
     {
-        try {
+        $user = $this->authenticate($condition);
 
-            $user = $this->authenticate($condition);
-
-            if (!$user) {
-                throw new LoginFailedException();
-            }
-            if ($user->status == Users::DISABLE) {
-                throw new LoginFailedException('该用户已被禁用|' . $user->username, Code::USER_FORBIDDEN);
-            }
-
-            if ($this->checkPassword && !password_verify($condition['password'], $user->password)) {
-                throw new LoginFailedException('登录失败|' . $user->username);
-            }
-
-            return $this->{$this->getDriver()}($user);
-
-        } catch (\Exception $exception) {
-            //
+        if (!$user) {
+            throw new LoginFailedException();
         }
+        if ($user->status == Users::DISABLE) {
+            throw new LoginFailedException('该用户已被禁用|' . $user->username, Code::USER_FORBIDDEN);
+        }
+
+        if ($this->checkPassword && !password_verify($condition['password'], $user->password)) {
+            throw new LoginFailedException('登录失败|' . $user->username);
+        }
+
+        return $this->{$this->getDriver()}($user);
     }
 
 
@@ -250,8 +243,10 @@ class CatchAuth
     {
         $where = [];
 
+        $fields = array_keys(app($this->getProvider()['model'])->getFields());
+
         foreach ($condition as $field => $value) {
-            if ($field != $this->password) {
+            if (in_array($field, $fields) && $field != $this->password) {
                 $where[$field] = $value;
             }
         }