login

app/Controller/LoginController.php

@@ -8,6 +8,7 @@ use App\Tools\PublicData;
 use App\Tools\Result;
 use Hyperf\Context\Context;
 use PHPStan\Type\Accessory\OversizedArrayType;
+use PHPUnit\Exception;
 use function Hyperf\Support\env;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
@@ -437,7 +438,11 @@ class LoginController extends AbstractController
         }else{
             $isDel = 1;
         }
-        $jwt->logout($reqData['token']);
+        try {
+            $jwt->logout($reqData['token']);
+        }catch (\Exception $e){
+            return Result::success(['isDel' => $isDel]);
+        }
         return Result::success(['isDel' => $isDel]);
     }
 
@@ -558,7 +563,6 @@ class LoginController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-
         $redis = $this->container->get(\Hyperf\Redis\Redis::class);
         $ticket = md5($reqData['admintoken']);
         $isDel = 0;
@@ -568,10 +572,15 @@ class LoginController extends AbstractController
         }else{
             $isDel = 1;
         }
-        setcookie("Admin-Token", "", time(), "/");
-        $jwt->logout($reqData['admintoken']);
-        $backurl = $this->fun_http($reqData['backurl']);
+//        setcookie("Admin-Token", "", time(), "/");
+        try {
+            $jwt->logout($reqData['admintoken']);
 
+        }catch (\Exception $e){
+            $backurl = $this->fun_http($reqData['backurl']);
+            return $this->response->redirect($backurl, 302);
+        }
+        $backurl = $this->fun_http($reqData['backurl']);
         return $this->response->redirect($backurl, 302);
     }
 

app/Middleware/Auth/SensitiveMiddleware.php

@@ -38,13 +38,9 @@ class SensitiveMiddleware implements MiddlewareInterface
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $uri = $request->getUri();
-//        var_dump("222:",$uri);
         // 获取接口路径（不包含查询参数）
         $path = $uri->getPath();
-//        var_dump("3333:",$path);
-//        var_dump("获取接口地址L:",$path);
         try {
-            var_dump("测试：",$path);
             if($path && in_array($path,self::STREAM_URL)){
                 $badWords = $this->redis->sMembers('black_word'); //黑名单
                 $whiteWords = $this->redis->sMembers('white_word');//白名单
@@ -81,7 +77,6 @@ class SensitiveMiddleware implements MiddlewareInterface
                     }
                 }
             }else{
-//                var_dump("测试：",$request);
                 return $handler->handle($request);
             }
         }catch (\Exception $e){