解决冲突文件

This commit is contained in:
monanxiao 2023-03-15 18:07:41 +08:00
parent b6bc7746a2
commit d301d2eb9f
2 changed files with 0 additions and 8 deletions

View File

@ -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
}
/**

View File

@ -6,9 +6,4 @@ return [
//验证勾股cms是否完成安装
\app\home\middleware\Install::class,
\app\api\middleware\AllowOriginMiddleware::class,
<<<<<<< HEAD
// \app\api\middleware\Auth::class,
=======
>>>>>>> master
];