Merge remote-tracking branch 'upstream/master'

# Conflicts: # app/Services/UserOnlineService.php # public/assets/admin
2026-04-16 16:59:21 +08:00
parent c3b2b4d4d0 13756956a6
commit abd64ed20c
103 changed files with 2153 additions and 16043 deletions
@@ -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);
    }