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
@@ -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);