From 3b4c485ae4f8bfb4b5d8c73c4bb6dbcc7fcafb2b Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 5 May 2022 12:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E6=B3=A8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/user/UserAuthServices.php   | 2 +-
 crmeb/app/services/user/UserCancelServices.php | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/crmeb/app/services/user/UserAuthServices.php b/crmeb/app/services/user/UserAuthServices.php
index 04c43f5d5..8b192c99a 100644
--- a/crmeb/app/services/user/UserAuthServices.php
+++ b/crmeb/app/services/user/UserAuthServices.php
@@ -68,7 +68,7 @@ class UserAuthServices extends BaseServices
             throw new AuthException('登录已过期,请重新登录', 410001);
         }
 
-        $user = $this->dao->get($id);
+        $user = $this->dao->get(['uid' => $id, 'is_del' => 0]);
 
         if (!$user || $user->uid != $tokenData['uid']) {
             if (!request()->isCli()) CacheService::clearToken($md5Token);
diff --git a/crmeb/app/services/user/UserCancelServices.php b/crmeb/app/services/user/UserCancelServices.php
index 683e1de31..52199ce5c 100644
--- a/crmeb/app/services/user/UserCancelServices.php
+++ b/crmeb/app/services/user/UserCancelServices.php
@@ -27,19 +27,12 @@ class UserCancelServices extends BaseServices
      */
     public function SetUserCancel($uid)
     {
-//        $data = [];
-//        $data['uid'] = $userInfo['uid'];
-//        $data['name'] = $userInfo['nickname'];
-//        $data['phone'] = $userInfo['phone'];
-//        $data['add_time'] = time();
-//        return $this->dao->save($data);
         /** @var UserServices $userServices */
         $userServices = app()->make(UserServices::class);
         /** @var WechatUserServices $wechatUserServices */
         $wechatUserServices = app()->make(WechatUserServices::class);
         $userServices->update($uid, ['is_del' => 1]);
         $wechatUserServices->update(['uid' => $uid], ['is_del' => 1]);
-        CacheService::clearTokenAll('api' . $uid);
     }
 
     /**
@@ -70,4 +63,4 @@ class UserCancelServices extends BaseServices
     {
         return $this->dao->update($id, ['remark' => $mark]);
     }
-}
\ No newline at end of file
+}