From da98b9a3311a38820e5d52dfe0adea52b9f7d4bd Mon Sep 17 00:00:00 2001
From: lingling <1077478963@qq.com>
Date: Thu, 20 Feb 2025 17:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=94=A8=E6=88=B7=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E9=89=B4=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/api/v1/AccountController.php |  1 +
 app/controller/api/UserController.php             |  1 +
 app/middleware/JwtAuthMiddleware.php              | 12 +++++++++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/controller/admin/api/v1/AccountController.php b/app/controller/admin/api/v1/AccountController.php
index fc495a5..bd7eada 100644
--- a/app/controller/admin/api/v1/AccountController.php
+++ b/app/controller/admin/api/v1/AccountController.php
@@ -53,6 +53,7 @@ class AccountController
                 'nickname'  => $db->nickname,
                 'username' => $db->username,
                 'access_exp'  => 2592000,
+                'user_type' => 'admin'
             ];
             // 如果密码正确，生成 JWT 令牌
             $token = JwtToken::generateToken($user);
diff --git a/app/controller/api/UserController.php b/app/controller/api/UserController.php
index ee47c2f..b2f9b2f 100644
--- a/app/controller/api/UserController.php
+++ b/app/controller/api/UserController.php
@@ -60,6 +60,7 @@ class UserController
             'id'  => $user->id,
             'username'  => $user->username,
             'access_exp'  => 2592000,
+            'user_type' => 'user'
         ];
         // 如果密码正确，生成 JWT 令牌
         $token = JwtToken::generateToken($tmp);
diff --git a/app/middleware/JwtAuthMiddleware.php b/app/middleware/JwtAuthMiddleware.php
index 829bb09..1553ed6 100644
--- a/app/middleware/JwtAuthMiddleware.php
+++ b/app/middleware/JwtAuthMiddleware.php
@@ -64,10 +64,16 @@ class JwtAuthMiddleware implements MiddlewareInterface
         try {
             // 解码 token，返回用户信息
             $decoded = JwtToken::getExtend($token);
-            $user=User::find($decoded['id']);
-            if($user->status==0){
-                return response('',401,['error' => '用户封禁']);
+            if(!empty($decoded['user_type'])&&$decoded['user_type']=='user'){
+                $user=User::find($decoded['id']);
+                if($user->status==0){
+                    return response('',401,['error' => '用户封禁']);
+                }
             }
+            $user=User::find($decoded['id']);
+            // if($user->status==0){
+            //     return response('',401,['error' => '用户封禁']);
+            // }
             // var_dump($decoded);
         } catch (\Exception $e) {
             var_dump($e);