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 17:37:45 +08:00
parent 722b8cfa7f
commit d3e0c64b58
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
catchAdmin/permissions/PermissionsMiddleware.php
View File

@ -3,7 +3,6 @@ namespace catchAdmin\permissions;
use app\Request; use app\Request;
use catchAdmin\permissions\model\Permissions; use catchAdmin\permissions\model\Permissions;
use catcher\CatchAdmin;
use catcher\exceptions\PermissionForbiddenException; use catcher\exceptions\PermissionForbiddenException;
use think\helper\Str; use think\helper\Str;
@ -22,6 +21,10 @@ 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())) {
@ -54,11 +57,6 @@ 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();