Carbon locale

This commit is contained in:
xiaomlove
2022-04-09 01:54:40 +08:00
parent fe4f7a204f
commit 93f8031ccd
3 changed files with 9 additions and 1 deletions
+2
View File
@@ -2,6 +2,7 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Carbon\Carbon;
use Closure; use Closure;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
@@ -28,6 +29,7 @@ class Locale
$locale = self::$languageMaps[$language->site_lang_folder] ?? 'en'; $locale = self::$languageMaps[$language->site_lang_folder] ?? 'en';
do_log("set locale: " . $locale); do_log("set locale: " . $locale);
App::setLocale($locale); App::setLocale($locale);
Carbon::setLocale($locale);
/** @var Response $response */ /** @var Response $response */
$response = $next($request); $response = $next($request);
+1 -1
View File
@@ -29,6 +29,6 @@ class AppServiceProvider extends ServiceProvider
{ {
// JsonResource::withoutWrapping(); // JsonResource::withoutWrapping();
DB::connection(config('database.default'))->enableQueryLog(); DB::connection(config('database.default'))->enableQueryLog();
// Nexus::boot();
} }
} }
+6
View File
@@ -129,6 +129,12 @@ final class Nexus
} }
foreach ($fields as $field) { foreach ($fields as $field) {
$result = $servers[$field] ?? null; $result = $servers[$field] ?? null;
if ($result && in_array($field, ['HTTP_X_FORWARDED_FOR', 'x-forwarded-for'])) {
$result = preg_split('/[,\s]+/', $result);
}
if (is_array($result)) {
$result = Arr::first($result);
}
if ($result !== null && $result !== '') { if ($result !== null && $result !== '') {
return $result; return $result;
} }