From 1f187ba8fbe75daab176714740af29ea7da0f2b8 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 20 Nov 2024 16:35:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Middleware/WebApi.php | 1 +
 app/Models/User.php            | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Middleware/WebApi.php b/app/Http/Middleware/WebApi.php
index fc100a4f3..f9788e09e 100644
--- a/app/Http/Middleware/WebApi.php
+++ b/app/Http/Middleware/WebApi.php
@@ -22,6 +22,7 @@ class WebApi
         // 为每个请求生成唯一ID
         $request->requestId = RequestContext::generateRequestId();
         RequestContext::set('start_time', microtime(true));
+        RequestContext::set('header_language', $request->header('language'));
 
         // 加载Doo类
         Doo::load();
diff --git a/app/Models/User.php b/app/Models/User.php
index dfdb0e868..c721b75db 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -10,7 +10,6 @@ use App\Module\Table\OnlineData;
 use App\Services\RequestContext;
 use Cache;
 use Carbon\Carbon;
-use Request;
 
 /**
  * App\Models\User
@@ -450,10 +449,10 @@ class User extends AbstractModel
             if (Carbon::parse($user->line_at)->addSeconds(30)->lt(Carbon::now())) {
                 $upArray['line_at'] = Carbon::now();
             }
-            if (empty($user->lang) || Request::hasHeader('language')) {
-                $lang = Request::header('language');
-                if (Doo::checkLanguage($lang) && $user->lang != $lang) {
-                    $upArray['lang'] = $lang;
+            $headerLanguage = RequestContext::get('header_language');
+            if (empty($user->lang) || $headerLanguage) {
+                if (Doo::checkLanguage($headerLanguage) && $user->lang != $headerLanguage) {
+                    $upArray['lang'] = $headerLanguage;
                 }
             }
             if ($upArray) {