修改权限判断,string关键字
parent
38bcf4e9d0
commit
9ae7096051
|
|
@ -4,10 +4,10 @@ namespace App\Admin\Middleware;
|
|||
|
||||
use Closure;
|
||||
use Dcat\Admin\Admin;
|
||||
use Illuminate\Http\Request;
|
||||
use Dcat\Admin\Http\Middleware\Authenticate;
|
||||
use Dcat\Admin\Layout\Content;
|
||||
use Dcat\Admin\Support\Helper;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class Permissions
|
||||
{
|
||||
|
|
@ -23,18 +23,18 @@ class Permissions
|
|||
$routeName = $request->route()->getName();
|
||||
$user = Admin::user();
|
||||
|
||||
if (!$this->shouldPassThrough($request) //路由是否是白名单
|
||||
&& !$user?->hasPermission($routeName)//是否有权限
|
||||
) {
|
||||
if (Helper::isAjaxRequest()) {
|
||||
abort(403, trans('admin.deny'));
|
||||
}
|
||||
|
||||
admin_exit(
|
||||
Content::make()->withError(trans('admin.deny'))
|
||||
);
|
||||
if ($this->shouldPassThrough($request) //路由白名单
|
||||
|| $user->hasPermission($routeName)) {//有权限
|
||||
return $next($request);
|
||||
}
|
||||
return $next($request);
|
||||
|
||||
if (Helper::isAjaxRequest()) {
|
||||
abort(403, trans('admin.deny'));
|
||||
}
|
||||
|
||||
admin_exit(
|
||||
Content::make()->withError(trans('admin.deny'))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use Dcat\Admin\Models\Administrator as DcatAdministrator;
|
|||
|
||||
class Administrator extends DcatAdministrator
|
||||
{
|
||||
public function hasPermission(String $slug): bool
|
||||
public function hasPermission(string $slug): bool
|
||||
{
|
||||
//判断是否是超级管理员
|
||||
if ($this->isAdministrator()) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue