修改daynumber的bug

scripts/fix_42792_and_scan.mjs

@@ -0,0 +1,94 @@
+// 一次性脚本：修复 42792 的 MiaoguoTask 重复记录/DayNumber，并只读扫描最近一个月相似问题用户。
+// 仅对 42792 做写操作；其余用户只做只读统计。
+import Miaoguo from '../src/model/miaoguo.js';
+import constantClass from '../src/util/constant/index.js';
+import { stringUtils } from '../src/util/stringClass.js';
+
+async function fixUser(userID) {
+    const tasks = await Miaoguo.RunSql([userID],
+        "SELECT * FROM MiaoguoTask where CardTask>0 and UserID=? order by CreateTime, ID desc;");
+    if (!tasks || tasks.length === 0) {
+        console.log(`User ${userID}: 无记录`);
+        return;
+    }
+
+    // 每天只保留“最完整”的一条：优先 IsShare>0 / 有里程碑 / 有格言，其次最新 ID
+    const dayBest = new Map();
+    const score = (x) => (x.IsShare > 0 ? 4 : 0) + (x.MilestoneDayNumber > 0 ? 2 : 0) + (x.AphorismID > 0 ? 1 : 0);
+    for (const t of tasks) {
+        const best = dayBest.get(t.CreateTime);
+        if (!best) dayBest.set(t.CreateTime, t);
+        else if (score(t) > score(best) || (score(t) === score(best) && t.ID > best.ID))
+            dayBest.set(t.CreateTime, t);
+    }
+
+    let deleted = 0;
+    for (const t of tasks) {
+        if (dayBest.get(t.CreateTime).ID !== t.ID) {
+            await Miaoguo.RunSql([t.ID], "delete from MiaoguoTask where ID=?;");
+            deleted++;
+        }
+    }
+
+    const dayTasks = [...dayBest.values()].sort((a, b) =>
+        a.CreateTime < b.CreateTime ? -1 : a.CreateTime > b.CreateTime ? 1 : a.ID - b.ID);
+
+    const milestone = constantClass.GetMilestone();
+    let milestoneIDs = [];
+    for (let i = 0; i < 40; i++) milestoneIDs.push(i + 1);
+    milestoneIDs = stringUtils.RandomArray(milestoneIDs);
+    let milestoneIndex = 0, hardworkingIndex = 0;
+    for (let i = 0; i < dayTasks.length; i++) {
+        const t = dayTasks[i];
+        const update = { ID: t.ID, DayNumber: i + 1 };
+        const milestoneItem = milestone.find(item => item.DayNumber == i + 1);
+        if (milestoneItem) {
+            update.MilestoneDayNumber = milestoneItem.DayNumber;
+            update.MilestoneID = milestoneIDs[milestoneIndex++];
+        }
+        if (t.IsShare > 0 || update.MilestoneDayNumber > 0 || t.AphorismID > 0)
+            update.HardworkingNumber = ++hardworkingIndex;
+        await Miaoguo.UpdateMiaoguoTask(update);
+    }
+    console.log(`User ${userID}: 删除重复行 ${deleted} 条，重编号 ${dayTasks.length} 天（DayNumber 1..${dayTasks.length}）`);
+}
+
+async function scanRecent() {
+    // 信号1：最近一个月存在“同一天多条(MiaoguoTask)记录”的用户（根因）
+    const dupDays = await Miaoguo.RunSql([], `
+        SELECT UserID, DATE(CreateTime) as d, COUNT(*) as cnt
+        FROM MiaoguoTask
+        WHERE CardTask>0 AND CreateTime >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
+        GROUP BY UserID, DATE(CreateTime)
+        HAVING cnt > 1
+        ORDER BY UserID, d;`);
+
+    const byUser = {};
+    for (const r of dupDays) byUser[r.UserID] = (byUser[r.UserID] || 0) + 1;
+
+    // 信号2：最近一个月 DayNumber 最大值 > 实际不同天数（说明历史上按行编号被撑大，存在断号风险）
+    const inflated = await Miaoguo.RunSql([], `
+        SELECT UserID,
+               COUNT(DISTINCT DATE(CreateTime)) as distinctDays,
+               MAX(DayNumber) as maxDayNumber
+        FROM MiaoguoTask
+        WHERE CardTask>0 AND CreateTime >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
+        GROUP BY UserID
+        HAVING maxDayNumber > distinctDays;`);
+
+    const inflatedUsers = inflated.map(r => r.UserID);
+
+    console.log('\n===== 扫描结果（最近一个月）=====');
+    console.log('信号1 - 有“同一天多条记录”的用户数:', Object.keys(byUser).length);
+    console.log('信号1 - 明细(用户ID: 重复天数):', byUser);
+    console.log('\n信号2 - DayNumber>实际天数(历史膨胀)的用户数:', inflatedUsers.length);
+    console.log('信号2 - 用户列表:', inflatedUsers);
+
+    const allAffected = new Set([...Object.keys(byUser), ...inflatedUsers]);
+    console.log('\n合计受影响用户数(任一信号):', allAffected.size);
+    console.log('合计用户ID:', [...allAffected].map(Number).sort((a, b) => a - b));
+}
+
+await fixUser(42792);
+await scanRecent();
+process.exit(0);

scripts/fix_44_users.mjs

@@ -0,0 +1,64 @@
+// 批量修复最近一个月存在 DayNumber 膨胀/断号的活跃用户（与 42792 相同的去重+按天连续重编号逻辑）。
+import Miaoguo from '../src/model/miaoguo.js';
+import constantClass from '../src/util/constant/index.js';
+import { stringUtils } from '../src/util/stringClass.js';
+
+const USER_IDS = [
+    1, 2, 321, 658, 699, 1586, 1631, 3232, 14845, 14916, 15220, 15278,
+    15360, 15362, 15387, 16297, 16791, 17315, 22192, 23093, 24084, 24142,
+    24149, 25310, 26887, 27170, 29864, 30393, 30894, 31436, 31917, 33746,
+    34777, 39733, 39769, 40981, 41301, 41496, 42666, 42668, 42702, 42792,
+    42860, 43485
+];
+
+async function fixUser(userID) {
+    const tasks = await Miaoguo.RunSql([userID],
+        "SELECT * FROM MiaoguoTask where CardTask>0 and UserID=? order by CreateTime, ID desc;");
+    if (!tasks || tasks.length === 0) return `User ${userID}: 无记录`;
+
+    const dayBest = new Map();
+    const score = (x) => (x.IsShare > 0 ? 4 : 0) + (x.MilestoneDayNumber > 0 ? 2 : 0) + (x.AphorismID > 0 ? 1 : 0);
+    for (const t of tasks) {
+        const best = dayBest.get(t.CreateTime);
+        if (!best) dayBest.set(t.CreateTime, t);
+        else if (score(t) > score(best) || (score(t) === score(best) && t.ID > best.ID))
+            dayBest.set(t.CreateTime, t);
+    }
+
+    let deleted = 0;
+    for (const t of tasks) {
+        if (dayBest.get(t.CreateTime).ID !== t.ID) {
+            await Miaoguo.RunSql([t.ID], "delete from MiaoguoTask where ID=?;");
+            deleted++;
+        }
+    }
+
+    const dayTasks = [...dayBest.values()].sort((a, b) =>
+        a.CreateTime < b.CreateTime ? -1 : a.CreateTime > b.CreateTime ? 1 : a.ID - b.ID);
+
+    const milestone = constantClass.GetMilestone();
+    let milestoneIDs = [];
+    for (let i = 0; i < 40; i++) milestoneIDs.push(i + 1);
+    milestoneIDs = stringUtils.RandomArray(milestoneIDs);
+    let milestoneIndex = 0, hardworkingIndex = 0;
+    for (let i = 0; i < dayTasks.length; i++) {
+        const t = dayTasks[i];
+        const update = { ID: t.ID, DayNumber: i + 1 };
+        const milestoneItem = milestone.find(item => item.DayNumber == i + 1);
+        if (milestoneItem) {
+            update.MilestoneDayNumber = milestoneItem.DayNumber;
+            update.MilestoneID = milestoneIDs[milestoneIndex++];
+        }
+        if (t.IsShare > 0 || update.MilestoneDayNumber > 0 || t.AphorismID > 0)
+            update.HardworkingNumber = ++hardworkingIndex;
+        await Miaoguo.UpdateMiaoguoTask(update);
+    }
+    return `User ${userID}: 删除 ${deleted} 条重复，重编号 ${dayTasks.length} 天 (DayNumber 1..${dayTasks.length})`;
+}
+
+for (const id of USER_IDS) {
+    const msg = await fixUser(id);
+    console.log(msg);
+}
+console.log(`\n完成，共处理 ${USER_IDS.length} 个用户。`);
+process.exit(0);

scripts/verify_42792.mjs

@@ -0,0 +1,13 @@
+import Miaoguo from '../src/model/miaoguo.js';
+
+const r = await Miaoguo.RunSql([42792],
+    'SELECT ID,CreateTime,DayNumber,IsShare,HardworkingNumber,MilestoneDayNumber FROM MiaoguoTask where UserID=? order by CreateTime desc limit 8;');
+console.log('42792 末 8 条:');
+for (const x of r)
+    console.log([x.ID, x.CreateTime, 'Day=' + x.DayNumber, 'Share=' + x.IsShare, 'HW=' + x.HardworkingNumber, 'Mil=' + x.MilestoneDayNumber].join(' | '));
+
+const g = await Miaoguo.RunSql([42792],
+    'SELECT COUNT(*) as rows, COUNT(DISTINCT DATE(CreateTime)) as days, MAX(DayNumber) as maxDay, MIN(DayNumber) as minDay FROM MiaoguoTask where CardTask>0 and UserID=?;');
+console.log('\n汇总:', JSON.stringify(g[0]));
+console.log(g[0].maxDay === g[0].days && g[0].minDay === 1 ? '=> DayNumber 连续且无膨胀 ✅' : '=> 仍有异常 ❌');
+process.exit(0);

scripts/verify_44_users.mjs

@@ -0,0 +1,26 @@
+import Miaoguo from '../src/model/miaoguo.js';
+
+const USER_IDS = [
+    1, 2, 321, 658, 699, 1586, 1631, 3232, 14845, 14916, 15220, 15278,
+    15360, 15362, 15387, 16297, 16791, 17315, 22192, 23093, 24084, 24142,
+    24149, 25310, 26887, 27170, 29864, 30393, 30894, 31436, 31917, 33746,
+    34777, 39733, 39769, 40981, 41301, 41496, 42666, 42668, 42702, 42792,
+    42860, 43485
+];
+
+const placeholders = USER_IDS.map(() => '?').join(',');
+const rows = await Miaoguo.RunSql(USER_IDS, `
+    SELECT UserID,
+           COUNT(DISTINCT DATE(CreateTime)) as days,
+           MAX(DayNumber) as maxDay,
+           MIN(DayNumber) as minDay
+    FROM MiaoguoTask
+    WHERE CardTask>0 AND UserID IN (${placeholders})
+    GROUP BY UserID
+    HAVING maxDay > days OR minDay <> 1;`);
+
+if (rows.length === 0)
+    console.log('✅ 44 个用户全部 DayNumber 连续且无膨胀，无残留异常。');
+else
+    console.log('❌ 仍有异常用户:', rows.map(r => `${r.UserID}(max=${r.maxDay},days=${r.days})`).join(', '));
+process.exit(0);

src/api/miaoguo/miaoguoController.js

@@ -3598,24 +3598,45 @@ export async function updateMiaoguoTaskData(ctx) {
         );
         const milestone = constantClass.GetMilestone();
         for (const user of taskUsers) {
-            const tasks = await miaoguo.RunSql([user.UserID], "SELECT * FROM MiaoguoTask where CardTask>0 and UserID=? order by CreateTime;");
+            const tasks = await miaoguo.RunSql([user.UserID], "SELECT * FROM MiaoguoTask where CardTask>0 and UserID=? order by CreateTime, ID desc;");
             if (!tasks || tasks.length == 0) continue;
+
+            // 同一天可能有多条记录（历史并发写入导致）。每天只保留“最完整”的一条，
+            // 优先 已分享(IsShare>0) / 有里程碑 / 有格言，其次保留最新 ID；其余重复行删除。
+            // 这样 DayNumber 按“天”连续递增，且不会因删除重复行而丢失分享/里程碑/勤勉信息。
+            const dayBest = new Map();
+            for (const t of tasks) {
+                const best = dayBest.get(t.CreateTime);
+                if (!best) {
+                    dayBest.set(t.CreateTime, t);
+                } else {
+                    const score = (x) => (x.IsShare > 0 ? 4 : 0) + (x.MilestoneDayNumber > 0 ? 2 : 0) + (x.AphorismID > 0 ? 1 : 0);
+                    if (score(t) > score(best) || (score(t) === score(best) && t.ID > best.ID))
+                        dayBest.set(t.CreateTime, t);
+                }
+            }
+            // 删除同一天的多余记录（仅保留 dayBest 中的那一条）
+            for (const t of tasks) {
+                if (dayBest.get(t.CreateTime).ID !== t.ID)
+                    await miaoguo.RunSql([t.ID], "delete from MiaoguoTask where ID=?;");
+            }
+            const dayTasks = [...dayBest.values()].sort((a, b) =>
+                a.CreateTime < b.CreateTime ? -1 : a.CreateTime > b.CreateTime ? 1 : a.ID - b.ID);
+
             let milestoneIDs = [];
             for (let i = 0; i < 40; i++) milestoneIDs.push(i + 1);
             milestoneIDs = stringUtils.RandomArray(milestoneIDs);
             let milestoneIndex = 0;
             let hardworkingIndex = 0;
-            for (let i = 0; i < tasks.length; i++) {
-                const update = {
-                    ID: tasks[i].ID,
-                    DayNumber: i + 1,
-                };
+            for (let i = 0; i < dayTasks.length; i++) {
+                const t = dayTasks[i];
+                const update = { ID: t.ID, DayNumber: i + 1 };
                 const milestoneItem = milestone.find(item => item.DayNumber == i + 1);
                 if (milestoneItem) {
                     update.MilestoneDayNumber = milestoneItem.DayNumber;
                     update.MilestoneID = milestoneIDs[milestoneIndex++];
                 }
-                if (tasks[i].IsShare > 0 || update.MilestoneDayNumber > 0 || tasks[i].AphorismID > 0)
+                if (t.IsShare > 0 || update.MilestoneDayNumber > 0 || t.AphorismID > 0)
                     update.HardworkingNumber = ++hardworkingIndex;
                 await miaoguo.UpdateMiaoguoTask(update);
             }

src/build.js

@@ -241,7 +241,9 @@ function UpdateMiaoguoTask() {
                     var item = list[index];
                     if (item && item.UserID) {
                         //console.log(item.UserID);
-                        var sql2 = "delete from MiaoguoTask where UserID=" + item.UserID + " and DATE_FORMAT(CreateTime,'%Y-%m-%d')='" + item.CreateTime + "' order by ID desc limit 1;";
+                        // 保留“最完整”的一条（优先 已分享 / 有里程碑 / 有格言，其次最新 ID），删除其余重复行，
+                        // 与 updateMiaoguoTaskData 重算时的去重口径保持一致，避免误删分享/里程碑记录
+                        var sql2 = "delete from MiaoguoTask where UserID=" + item.UserID + " and DATE_FORMAT(CreateTime,'%Y-%m-%d')='" + item.CreateTime + "' and ID not in (select ID from (select ID from MiaoguoTask where UserID=" + item.UserID + " and DATE_FORMAT(CreateTime,'%Y-%m-%d')='" + item.CreateTime + "' order by (IsShare>0) desc,(MilestoneDayNumber>0) desc,(AphorismID>0) desc,ID desc limit 1) as t);";
                         miaoguo.RunSql({}, sql2);
                     }