From 28ff4ea2d97569d2feffab143b2482330ee7af84 Mon Sep 17 00:00:00 2001 From: qnnp-me Date: Sat, 4 Mar 2023 02:57:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=8E=A5=E5=85=A5admin?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A0=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E8=B0=83=E7=94=A8=E4=B8=8D=E5=88=B0?= =?UTF-8?q?admin=E7=9A=84403=E6=96=87=E4=BB=B6=E8=80=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugin/admin/app/middleware/AccessControl.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugin/admin/app/middleware/AccessControl.php b/src/plugin/admin/app/middleware/AccessControl.php index 1aebaa6..f9779d8 100644 --- a/src/plugin/admin/app/middleware/AccessControl.php +++ b/src/plugin/admin/app/middleware/AccessControl.php @@ -21,6 +21,11 @@ class AccessControl implements MiddlewareInterface $controller = $request->controller; $action = $request->action; + $plugin=$request->plugin; + $app=$request->app; + $request->plugin='admin'; + $request->app=''; + $code = 0; $msg = ''; if (!Auth::canAccess($controller, $action, $code, $msg)) { @@ -42,6 +47,8 @@ EOF } } else { + $request->plugin=$plugin; + $request->app=$app; $response = $request->method() == 'OPTIONS' ? response('') : $handler($request); } @@ -49,4 +56,4 @@ EOF } -} \ No newline at end of file +} From 47047b9c653734c06232b9fb38b343d7f0788375 Mon Sep 17 00:00:00 2001 From: qnnp-me Date: Sat, 4 Mar 2023 20:00:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=8E=A5=E5=85=A5admin?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A0=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E8=B0=83=E7=94=A8=E4=B8=8D=E5=88=B0?= =?UTF-8?q?admin=E7=9A=84403=E6=96=87=E4=BB=B6=E8=80=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugin/admin/app/middleware/AccessControl.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/plugin/admin/app/middleware/AccessControl.php b/src/plugin/admin/app/middleware/AccessControl.php index 90b7bfd..081d0ee 100644 --- a/src/plugin/admin/app/middleware/AccessControl.php +++ b/src/plugin/admin/app/middleware/AccessControl.php @@ -21,11 +21,6 @@ class AccessControl implements MiddlewareInterface $controller = $request->controller; $action = $request->action; - $plugin=$request->plugin; - $app=$request->app; - $request->plugin='admin'; - $request->app=''; - $code = 0; $msg = ''; if (!Auth::canAccess($controller, $action, $code, $msg)) { @@ -42,14 +37,13 @@ class AccessControl implements MiddlewareInterface EOF ); } else { + $request->app = ''; $request->plugin = 'admin'; $response = view('common/error/403')->withStatus(403); } } } else { - $request->plugin=$plugin; - $request->app=$app; $response = $request->method() == 'OPTIONS' ? response('') : $handler($request); }