From 35cb596557c9ea60b99b7c1f9b20c43fe324e009 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Fri, 5 Aug 2022 11:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E5=85=B1=E4=BA=AB=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Exceptions/Handler.php | 2 +-
 app/Http/Kernel.php        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 90337928..7e21b48b 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -42,7 +42,7 @@ class Handler extends ExceptionHandler
 
 
     /**
-     * 自定义错误信息页面, 前台与后台不同 需要分开定义
+     * 自定义错误信息页面, 前台与后台不同, 需要分开定义
      */
     protected function registerErrorViewPaths()
     {
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index f68acc4f..af2cebea 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -24,7 +24,7 @@ class Kernel extends HttpKernel
 
     /**
      * The application's route middleware groups.
-     *
+     * session => locale => share_data => error_page
      * @var array
      */
     protected $middlewareGroups = [
@@ -34,20 +34,20 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \App\Http\Middleware\SetLocaleFromSession::class,
+            \App\Http\Middleware\ShareViewData::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\ShareViewData::class,
         ],
         'admin' => [
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \App\Http\Middleware\SetLocaleAdmin::class,
+            \App\Http\Middleware\ShareViewData::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\ShareViewData::class,
         ],
 
         'api' => [