解决冲突文件
This commit is contained in:
parent
b6bc7746a2
commit
d301d2eb9f
@ -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
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -6,9 +6,4 @@ return [
|
||||
//验证勾股cms是否完成安装
|
||||
\app\home\middleware\Install::class,
|
||||
\app\api\middleware\AllowOriginMiddleware::class,
|
||||
<<<<<<< HEAD
|
||||
// \app\api\middleware\Auth::class,
|
||||
=======
|
||||
|
||||
>>>>>>> master
|
||||
];
|
Loading…
x
Reference in New Issue
Block a user