From a4283f9ef5883e35efbe236244b3881cfb8cb3aa Mon Sep 17 00:00:00 2001
From: ypsdf1 <nihaoshidifu@gitee.com>
Date: Tue, 27 Oct 2026 12:07:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC57=E6=89=B9=E7=BB=AD18:=20sync.php?=
 =?UTF-8?q?=E5=AD=A4=E7=AB=8B=E6=B8=85=E7=90=86=E5=8A=A024h=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E5=AE=BD=E9=99=90=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因: syncLogin无条件DELETE FROM users清理孤立记录, 当Java端某轮漏推
(如pull>0早return) 导致刚注册玩家aDuki_Abb被误删 → 网页isPlayerRegistered
只查users表查不到 → 弹"请使用/reg"。

修复: 仅删"不在本次推送 且 register_time距今超过24h"的玩家;
register_time存秒, 异常毫秒自动归一; 分批IN子句+参数绑定防注入;
宽限期内保留的刚注册用户记debugLog。
---
 api/sync.php | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/api/sync.php b/api/sync.php
index 03ffef5..c2f05c0 100644
--- a/api/sync.php
+++ b/api/sync.php
@@ -1872,11 +1872,41 @@ function syncLogin() {
                 $phpUsers[] = $row['player_name'];
             }
             
+            // ★ 第57批续18: 注册宽限期 —— 仅删"不在本次推送 且 注册距今超过24h"的玩家
+            // 防止 Java 端某轮漏推导致刚注册玩家被误删(网页端重新要求 /reg)
             $orphanedUsers = array_diff($phpUsers, $namesInSync);
+            $graceCutoff = $now - 24 * 3600;
+            $deletableUsers = [];
+            $skippedRecent = [];
             if (!empty($orphanedUsers)) {
-                $nameList = implode("','", array_map(function($n) use ($db) { return addslashes($n); }, $orphanedUsers));
-                $db->exec("DELETE FROM users WHERE player_name IN ('" . $nameList . "')");
-                debugLog("sync_login: 清理了 " . count($orphanedUsers) . " 个孤立的 users 记录", ['orphaned' => $orphanedUsers]);
+                foreach (array_chunk(array_map(function($n) { return (string)$n; }, $orphanedUsers), 200) as $chunk) {
+                    $inPlaceholder = implode(",", array_fill(0, count($chunk), "?"));
+                    $s2 = $db->prepare("SELECT player_name, register_time FROM users WHERE player_name IN (" . $inPlaceholder . ")");
+                    foreach ($chunk as $i => $n) {
+                        $s2->bindValue($i + 1, $n, SQLITE3_TEXT);
+                    }
+                    $res = $s2->execute();
+                    while ($row = $res->fetchArray(SQLITE3_ASSOC)) {
+                        $rt = (int)$row['register_time'];
+                        // register_time 存的是秒;若异常为毫秒则归一
+                        if ($rt > 1000000000000) { $rt = intval($rt / 1000); }
+                        if ($rt > 0 && $rt >= $graceCutoff) {
+                            $skippedRecent[] = $row['player_name'];
+                        } else {
+                            $deletableUsers[] = $row['player_name'];
+                        }
+                    }
+                }
+                if (!empty($deletableUsers)) {
+                    $nameList = implode("','", array_map(function($n) { return addslashes($n); }, $deletableUsers));
+                    $db->exec("DELETE FROM users WHERE player_name IN ('" . $nameList . "')");
+                    debugLog("sync_login: 清理了 " . count($deletableUsers) . " 个孤立的 users 记录", [
+                        'deleted' => $deletableUsers,
+                        'skipped_recent_grace' => $skippedRecent
+                    ]);
+                } elseif (!empty($skippedRecent)) {
+                    debugLog("sync_login: 宽限期内保留 " . count($skippedRecent) . " 个刚注册用户", ['skipped' => $skippedRecent]);
+                }
             }
         } catch (\Throwable $e) {
             debugLog("sync_login: 清理孤立 users 记录失败", ['error' => $e->getMessage()]);