0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改权限

Browse Source
This commit is contained in:
wuyanwen 2019-12-14 16:54:56 +08:00
parent d3dfe38d60
commit 3ec10515fb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
catchAdmin/permissions/PermissionsMiddleware.php
View File

@ -22,9 +22,6 @@ class PermissionsMiddleware
*/ */
public function handle(Request $request, \Closure $next) public function handle(Request $request, \Closure $next)
{ {
if (!$request->user()) {
throw new PermissionForbiddenException('Login is invalid', 10006);
}
// toad // toad
if (($permission = $this->getPermission($request)) if (($permission = $this->getPermission($request))
&& !in_array($permission->id, $request->user()->getPermissionsBy())) { && !in_array($permission->id, $request->user()->getPermissionsBy())) {
@ -38,10 +35,11 @@ class PermissionsMiddleware
* *
* @time 2019年12月12日 * @time 2019年12月12日
* @param $request * @param $request
* @throws \think\db\exception\DataNotFoundException * @return array|bool|\think\Model|null
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @return array|bool|\think\Model|null * @throws PermissionForbiddenException
* @throws \think\db\exception\DataNotFoundException
*/ */
protected function getPermission(Request $request) protected function getPermission(Request $request)
{ {
@ -56,7 +54,11 @@ class PermissionsMiddleware
array_pop($controller); array_pop($controller);
$module = array_pop($controller); $module = array_pop($controller);
if ($module != 'login') {
if (!$request->user()) {
throw new PermissionForbiddenException('Login is invalid', 10006);
}
}
$permissionMark = sprintf('%s:%s', $controllerName, $action); $permissionMark = sprintf('%s:%s', $controllerName, $action);
$permission = Permissions::where('module', $module)->where('permission_mark', $permissionMark)->find(); $permission = Permissions::where('module', $module)->where('permission_mark', $permissionMark)->find();