From d301d2eb9ff6cb10829a19688f12f1b8ca333ffe Mon Sep 17 00:00:00 2001 From: monanxiao Date: Wed, 15 Mar 2023 18:07:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/BaseController.php | 3 --- app/api/middleware.php | 5 ----- 2 files changed, 8 deletions(-) diff --git a/app/api/BaseController.php b/app/api/BaseController.php index 4f36c9d..55d2299 100644 --- a/app/api/BaseController.php +++ b/app/api/BaseController.php @@ -133,8 +133,6 @@ abstract class BaseController return json(['code'=>404,'msg'=>'token不能为空']); } -<<<<<<< HEAD -======= // return $decoded->jti[0]; // exit; // //var_dump($config);exit; @@ -175,7 +173,6 @@ abstract class BaseController // } // 暂时去除 ----------------------------------------------------- ->>>>>>> master } /** diff --git a/app/api/middleware.php b/app/api/middleware.php index 13e3f70..91dea02 100644 --- a/app/api/middleware.php +++ b/app/api/middleware.php @@ -6,9 +6,4 @@ return [ //验证勾股cms是否完成安装 \app\home\middleware\Install::class, \app\api\middleware\AllowOriginMiddleware::class, -<<<<<<< HEAD - // \app\api\middleware\Auth::class, -======= - ->>>>>>> master ]; \ No newline at end of file