diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index fad237a6..83496539 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -28,7 +28,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middlewareGroups = [
-        'web' => [
+        'shop' => [
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
@@ -39,6 +39,16 @@ class Kernel extends HttpKernel
             \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\SetLocale::class,
+            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+            \App\Http\Middleware\VerifyCsrfToken::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\ShareViewData::class,
+        ],
 
         'api' => [
             // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
diff --git a/app/Http/Middleware/SetLocaleAdmin.php b/app/Http/Middleware/SetLocaleAdmin.php
new file mode 100644
index 00000000..58472713
--- /dev/null
+++ b/app/Http/Middleware/SetLocaleAdmin.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+
+class SetLocaleAdmin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Request $request
+     * @param Closure $next
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $sessionLocale = session('locale');
+        if ($sessionLocale && in_array($sessionLocale, languages()->toArray())) {
+            App::setLocale($sessionLocale);
+        } else {
+            $configLocale = system_setting('base.locale');
+            App::setLocale($configLocale);
+            session(['locale' => $configLocale]);
+        }
+        return $next($request);
+    }
+}
diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php
index 042fe97d..3dc25270 100644
--- a/beike/Admin/Routes/admin.php
+++ b/beike/Admin/Routes/admin.php
@@ -6,7 +6,7 @@ use Illuminate\Support\Facades\Route;
 
 $adminName = admin_name();
 Route::prefix($adminName)
-    ->middleware(['web'])
+    ->middleware(['admin'])
     ->name("{$adminName}.")
     ->group(function () {
         Route::get('brands/autocomplete', [Controllers\BrandController::class, 'autocomplete'])->name('brands.autocomplete');
diff --git a/beike/Helpers.php b/beike/Helpers.php
index beea327b..21670ba2 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -249,16 +249,6 @@ function languages(): Collection
     return LanguageRepo::enabled()->pluck('code');
 }
 
-/**
- * 当前语言ID
- *
- * @return int
- */
-function current_language_id(): int
-{
-    return 1;
-}
-
 /**
  * 当前语言
  *
diff --git a/beike/Shop/Routes/shop.php b/beike/Shop/Routes/shop.php
index cd5c789c..eeeea6db 100644
--- a/beike/Shop/Routes/shop.php
+++ b/beike/Shop/Routes/shop.php
@@ -25,7 +25,7 @@ use Beike\Shop\Http\Controllers\Account\ForgottenController;
 
 Route::prefix('/')
     ->name('shop.')
-    ->middleware(['web'])
+    ->middleware(['shop'])
     ->group(function () {
         Route::get('/', [HomeController::class, 'index'])->name('home.index');