mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-15 13:22:49 +00:00
fix: 文件打包下载
This commit is contained in:
parent
9c4ff466a4
commit
1f187ba8fb
@ -22,6 +22,7 @@ class WebApi
|
|||||||
// 为每个请求生成唯一ID
|
// 为每个请求生成唯一ID
|
||||||
$request->requestId = RequestContext::generateRequestId();
|
$request->requestId = RequestContext::generateRequestId();
|
||||||
RequestContext::set('start_time', microtime(true));
|
RequestContext::set('start_time', microtime(true));
|
||||||
|
RequestContext::set('header_language', $request->header('language'));
|
||||||
|
|
||||||
// 加载Doo类
|
// 加载Doo类
|
||||||
Doo::load();
|
Doo::load();
|
||||||
|
|||||||
@ -10,7 +10,6 @@ use App\Module\Table\OnlineData;
|
|||||||
use App\Services\RequestContext;
|
use App\Services\RequestContext;
|
||||||
use Cache;
|
use Cache;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Request;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* App\Models\User
|
* App\Models\User
|
||||||
@ -450,10 +449,10 @@ class User extends AbstractModel
|
|||||||
if (Carbon::parse($user->line_at)->addSeconds(30)->lt(Carbon::now())) {
|
if (Carbon::parse($user->line_at)->addSeconds(30)->lt(Carbon::now())) {
|
||||||
$upArray['line_at'] = Carbon::now();
|
$upArray['line_at'] = Carbon::now();
|
||||||
}
|
}
|
||||||
if (empty($user->lang) || Request::hasHeader('language')) {
|
$headerLanguage = RequestContext::get('header_language');
|
||||||
$lang = Request::header('language');
|
if (empty($user->lang) || $headerLanguage) {
|
||||||
if (Doo::checkLanguage($lang) && $user->lang != $lang) {
|
if (Doo::checkLanguage($headerLanguage) && $user->lang != $headerLanguage) {
|
||||||
$upArray['lang'] = $lang;
|
$upArray['lang'] = $headerLanguage;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($upArray) {
|
if ($upArray) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user