Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	app/Services/UserOnlineService.php
#	public/assets/admin

app/Http/Controllers/V1/Client/ClientController.php

@@ -80,7 +80,8 @@ class ClientController extends Controller
             'user' => $user,
             'servers' => $serversFiltered,
             'clientName' => $clientInfo['name'] ?? null,
-            'clientVersion' => $clientInfo['version'] ?? null
+            'clientVersion' => $clientInfo['version'] ?? null,
+            'userAgent' => $clientInfo['flag'] ?? null
         ]);
 
         return $protocolInstance->handle();

app/Http/Controllers/V1/Passport/CommController.php

@@ -29,7 +29,7 @@ class CommController extends Controller
 
         // 检查白名单后缀限制
         if ((int) admin_setting('email_whitelist_enable', 0)) {
-            $isRegisteredEmail = User::where('email', $email)->exists();
+            $isRegisteredEmail = User::byEmail($email)->exists();
             if (!$isRegisteredEmail) {
                 $allowedSuffixes = Helper::getEmailSuffix();
                 $emailSuffix = substr(strrchr($email, '@'), 1);

app/Http/Controllers/V1/Server/UniProxyController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\V1\Server;
 
 use App\Http\Controllers\Controller;
-use App\Jobs\UserAliveSyncJob;
+use App\Services\DeviceStateService;
 use App\Services\NodeSyncService;
 use App\Services\ServerService;
 use App\Services\UserService;
@@ -11,13 +11,12 @@ use App\Utils\CacheKey;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use App\Services\UserOnlineService;
 use Illuminate\Http\JsonResponse;
 
 class UniProxyController extends Controller
 {
     public function __construct(
-        private readonly UserOnlineService $userOnlineService
+        private readonly DeviceStateService $deviceStateService
     ) {
     }
 
@@ -103,13 +102,15 @@ class UniProxyController extends Controller
         return response($response)->header('ETag', "\"{$eTag}\"");
     }
 
-    // 获取在线用户数据（wyx2685
+    // 获取在线用户数据
     public function alivelist(Request $request): JsonResponse
     {
         $node = $this->getNodeInfo($request);
         $deviceLimitUsers = ServerService::getAvailableUsers($node)
             ->where('device_limit', '>', 0);
-        $alive = $this->userOnlineService->getAliveList($deviceLimitUsers);
+
+        $alive = $this->deviceStateService->getAliveList(collect($deviceLimitUsers));
+
         return response()->json(['alive' => (object) $alive]);
     }
 
@@ -123,7 +124,11 @@ class UniProxyController extends Controller
                 'error' => 'Invalid online data'
             ], 400);
         }
-        UserAliveSyncJob::dispatch($data, $node->type, $node->id);
+
+        foreach ($data as $uid => $ips) {
+            $this->deviceStateService->setDevices((int) $uid, $node->id, $ips);
+        }
+
         return response()->json(['data' => true]);
     }
 

app/Http/Controllers/V1/User/UserController.php

@@ -74,6 +74,14 @@ class UserController extends Controller
         if (!$user->save()) {
             return $this->fail([400, __('Save failed')]);
         }
+        
+        $currentToken = $user->currentAccessToken();
+        if ($currentToken) {
+            $user->tokens()->where('id', '!=', $currentToken->id)->delete();
+        } else {
+            $user->tokens()->delete();
+        }
+        
         return $this->success(true);
     }