From 92c4565590f4a51f99abb1222ab0c4f6a6805885 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 21 Apr 2025 01:54:50 +0800 Subject: [PATCH] no message --- app/Models/UserDevice.php | 15 +++++++++++---- resources/mobile | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/Models/UserDevice.php b/app/Models/UserDevice.php index 68d3a4c24..077a3ac10 100644 --- a/app/Models/UserDevice.php +++ b/app/Models/UserDevice.php @@ -8,6 +8,7 @@ use Cache; use Carbon\Carbon; use DeviceDetector\DeviceDetector; use Illuminate\Database\Eloquent\SoftDeletes; +use Request; /** * App\Models\UserDevice @@ -219,15 +220,21 @@ class UserDevice extends AbstractModel $userid = $info['userid'] ?? 0; $expiredAt = $info['expired_at'] ?? null; } + $deviceData = [ + 'detail' => Base::array2json(self::getDeviceInfo($_SERVER['HTTP_USER_AGENT'] ?? '')), + 'expired_at' => $expiredAt, + ]; $hash = md5($token); $row = self::updateInsert([ 'userid' => $userid, 'hash' => $hash, - ], [ - 'detail' => Base::array2json(self::getDeviceInfo($_SERVER['HTTP_USER_AGENT'] ?? '')), - 'expired_at' => $expiredAt, - ]); + ], function() use ($deviceData) { + if (!Request::hasHeader('version')) { + unset($deviceData['detail']); + } + return $deviceData; + }, $deviceData); if ($row) { Cache::put(self::ck($hash), $row->userid, now()->addHour()); return $row; diff --git a/resources/mobile b/resources/mobile index 8e39dffb2..674b3ed99 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 8e39dffb237dcf6091d75958f8decc07721a7950 +Subproject commit 674b3ed99119bd02d2af3a2265bb7beab70ae2f0