|
@@ -9,6 +9,7 @@ use App\Services\ProjectServer; |
|
@@ -9,6 +9,7 @@ use App\Services\ProjectServer; |
|
9
|
use Closure;
|
9
|
use Closure;
|
|
10
|
use Illuminate\Http\Request;
|
10
|
use Illuminate\Http\Request;
|
|
11
|
use Illuminate\Support\Facades\Cache;
|
11
|
use Illuminate\Support\Facades\Cache;
|
|
|
|
12
|
+use Illuminate\Support\Facades\Route;
|
|
12
|
|
13
|
|
|
13
|
class LoginAuthMiddleware
|
14
|
class LoginAuthMiddleware
|
|
14
|
{
|
15
|
{
|
|
@@ -28,7 +29,7 @@ class LoginAuthMiddleware |
|
@@ -28,7 +29,7 @@ class LoginAuthMiddleware |
|
28
|
}
|
29
|
}
|
|
29
|
$role_info = $this->setRole($info);
|
30
|
$role_info = $this->setRole($info);
|
|
30
|
//获取当前操作的控制器与方法
|
31
|
//获取当前操作的控制器与方法
|
|
31
|
- $action = $request->route()->getAction();
|
32
|
+ $action = Route::currentRouteName();
|
|
32
|
//查询当前用户是否拥有权限操作
|
33
|
//查询当前用户是否拥有权限操作
|
|
33
|
$this->viewOperateAuth($role_info,$action);
|
34
|
$this->viewOperateAuth($role_info,$action);
|
|
34
|
//配置数据库
|
35
|
//配置数据库
|
|
@@ -77,7 +78,7 @@ class LoginAuthMiddleware |
|
@@ -77,7 +78,7 @@ class LoginAuthMiddleware |
|
77
|
*/
|
78
|
*/
|
|
78
|
public function viewOperateAuth($role_info,$action){
|
79
|
public function viewOperateAuth($role_info,$action){
|
|
79
|
$projectMenuModel = new ProjectMenu();
|
80
|
$projectMenuModel = new ProjectMenu();
|
|
80
|
- $menu_id = $projectMenuModel->read(['action'=>$action['as']],['id']);
|
81
|
+ $menu_id = $projectMenuModel->read(['action'=>$action],['id']);
|
|
81
|
if($menu_id !== false){
|
82
|
if($menu_id !== false){
|
|
82
|
if(strpos($role_info['role_menu'], $menu_id['id']) < 0){
|
83
|
if(strpos($role_info['role_menu'], $menu_id['id']) < 0){
|
|
83
|
return response(['code'=>Code::USER_LOGIN_ERROE,'msg'=>'当前用户没有权限']);
|
84
|
return response(['code'=>Code::USER_LOGIN_ERROE,'msg'=>'当前用户没有权限']);
|