v2.1.0 流程改造 + 农历准确性修复 + 双向同步 + 闰月支持

- Phase 1: 添加纪念日合并人物创建流程（方案 B）
- Phase 2: 农历提醒按 lunarMonth/Day 计算每年公历
- Phase 3: 人员数据同步到后端（新增 /api/person）
- Phase 4: 新设备启动从云端恢复数据
- Phase 5: 工具函数收敛 utils/format.js
- Phase 6: 同步失败入队 + 启动重试
- Phase 7: 闰月生日完整支持（含 isLeapMonth + UI 警示）
- 修复 lunarInfo 数据表错位（替换为权威源 jjonline/calendar.js）

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

server/src/db.js

@@ -24,6 +24,10 @@ db.exec(`
     solarYear       INTEGER,
     solarMonth      INTEGER,
     solarDay        INTEGER,
+    lunarYear       INTEGER,
+    lunarMonth      INTEGER,
+    lunarDay        INTEGER,
+    isLeapMonth     INTEGER DEFAULT 0,
     importance      TEXT,
     remindEnabled   INTEGER DEFAULT 0,
     remindDays      INTEGER DEFAULT 0,
@@ -34,6 +38,18 @@ db.exec(`
   CREATE INDEX IF NOT EXISTS idx_anniv_openid ON anniversaries(openid);
   CREATE INDEX IF NOT EXISTS idx_anniv_remind ON anniversaries(remindEnabled);
 
+  CREATE TABLE IF NOT EXISTS persons (
+    id          TEXT PRIMARY KEY,
+    openid      TEXT NOT NULL,
+    name        TEXT NOT NULL,
+    nickname    TEXT,
+    avatar      TEXT,
+    remark      TEXT,
+    createTime  INTEGER,
+    updateTime  INTEGER
+  );
+  CREATE INDEX IF NOT EXISTS idx_person_openid ON persons(openid);
+
   CREATE TABLE IF NOT EXISTS remind_logs (
     id              INTEGER PRIMARY KEY AUTOINCREMENT,
     anniversaryId   TEXT,
@@ -48,4 +64,18 @@ db.exec(`
   CREATE INDEX IF NOT EXISTS idx_log_date ON remind_logs(sendDate);
 `)
 
+// 旧库迁移：CREATE TABLE IF NOT EXISTS 不会给已存在的表加列，需要手动 ALTER
+// 失败说明列已存在，安全忽略
+function tryAddColumn(table, column, type) {
+  try {
+    db.prepare(`ALTER TABLE ${table} ADD COLUMN ${column} ${type}`).run()
+  } catch (e) {
+    if (!/duplicate column/i.test(e.message)) throw e
+  }
+}
+tryAddColumn('anniversaries', 'lunarYear', 'INTEGER')
+tryAddColumn('anniversaries', 'lunarMonth', 'INTEGER')
+tryAddColumn('anniversaries', 'lunarDay', 'INTEGER')
+tryAddColumn('anniversaries', 'isLeapMonth', 'INTEGER DEFAULT 0')
+
 module.exports = db

server/src/index.js

@@ -26,6 +26,27 @@ app.post('/api/login', async (req, res) => {
   }
 })
 
+// 人员操作（与 anniversary 同款 action 协议）
+app.post('/api/person', (req, res) => {
+  try {
+    const openid = req.headers['x-openid'] || req.body.openid
+    if (!openid) return res.json({ success: false, error: '缺少 openid' })
+
+    const { action, data } = req.body
+    switch (action) {
+      case 'add':    return res.json(addPerson(openid, data))
+      case 'update': return res.json(updatePerson(openid, data))
+      case 'delete': return res.json(deletePerson(openid, data.id))
+      case 'sync':   return res.json(syncPersons(openid, data))
+      case 'get':    return res.json(getPersons(openid))
+      default:       return res.json({ success: false, error: '未知操作' })
+    }
+  } catch (err) {
+    console.error('人员操作失败:', err.message)
+    res.json({ success: false, error: err.message })
+  }
+})
+
 // 纪念日操作（兼容原云函数 syncAnniversary 的 action 协议）
 app.post('/api/anniversary', (req, res) => {
   try {
@@ -51,8 +72,10 @@ app.post('/api/anniversary', (req, res) => {
 
 const FIELDS = [
   'id', 'openid', 'personId', 'personName', 'type', 'customTypeName',
-  'isLunar', 'solarYear', 'solarMonth', 'solarDay', 'importance',
-  'remindEnabled', 'remindDays', 'remark', 'createTime', 'updateTime'
+  'isLunar', 'solarYear', 'solarMonth', 'solarDay',
+  'lunarYear', 'lunarMonth', 'lunarDay', 'isLeapMonth',
+  'importance', 'remindEnabled', 'remindDays', 'remark',
+  'createTime', 'updateTime'
 ]
 
 function normalize(row) {
@@ -60,7 +83,8 @@ function normalize(row) {
   return {
     ...row,
     isLunar: !!row.isLunar,
-    remindEnabled: !!row.remindEnabled
+    remindEnabled: !!row.remindEnabled,
+    isLeapMonth: !!row.isLeapMonth
   }
 }
 
@@ -77,6 +101,10 @@ function addAnniversary(openid, anniv) {
     solarYear: anniv.solarYear ?? null,
     solarMonth: anniv.solarMonth,
     solarDay: anniv.solarDay,
+    lunarYear: anniv.lunarYear ?? null,
+    lunarMonth: anniv.lunarMonth ?? null,
+    lunarDay: anniv.lunarDay ?? null,
+    isLeapMonth: anniv.isLeapMonth ? 1 : 0,
     importance: anniv.importance || 'normal',
     remindEnabled: anniv.remindEnabled ? 1 : 0,
     remindDays: anniv.remindDays ?? 0,
@@ -99,6 +127,7 @@ function updateAnniversary(openid, anniv) {
     openid,
     isLunar: ('isLunar' in anniv ? (anniv.isLunar ? 1 : 0) : existing.isLunar),
     remindEnabled: ('remindEnabled' in anniv ? (anniv.remindEnabled ? 1 : 0) : existing.remindEnabled),
+    isLeapMonth: ('isLeapMonth' in anniv ? (anniv.isLeapMonth ? 1 : 0) : existing.isLeapMonth),
     updateTime: Date.now()
   }
   const sets = FIELDS.filter(f => f !== 'id' && f !== 'openid' && f !== 'createTime')
@@ -126,6 +155,64 @@ function getAnniversaries(openid) {
   return { success: true, data: rows.map(normalize) }
 }
 
+// ---- 人员 CRUD ----
+
+const PERSON_FIELDS = ['id', 'openid', 'name', 'nickname', 'avatar', 'remark', 'createTime', 'updateTime']
+
+function buildPersonRow(openid, person) {
+  const now = Date.now()
+  const id = person.id || ('id_' + now + '_' + Math.random().toString(36).slice(2, 11))
+  return {
+    id, openid,
+    name: person.name || '',
+    nickname: person.nickname || null,
+    avatar: person.avatar || null,
+    remark: person.remark || null,
+    createTime: person.createTime || now,
+    updateTime: now
+  }
+}
+
+function addPerson(openid, person) {
+  const row = buildPersonRow(openid, person)
+  const placeholders = PERSON_FIELDS.map(f => '@' + f).join(', ')
+  db.prepare(`INSERT OR REPLACE INTO persons (${PERSON_FIELDS.join(',')}) VALUES (${placeholders})`).run(row)
+  return { success: true, id: row.id }
+}
+
+function updatePerson(openid, person) {
+  const existing = db.prepare('SELECT * FROM persons WHERE id = ? AND openid = ?').get(person.id, openid)
+  if (!existing) return { success: false, error: '人员不存在' }
+  const merged = { ...existing, ...person, openid, updateTime: Date.now() }
+  const sets = PERSON_FIELDS.filter(f => f !== 'id' && f !== 'openid' && f !== 'createTime')
+    .map(f => `${f} = @${f}`).join(', ')
+  db.prepare(`UPDATE persons SET ${sets} WHERE id = @id AND openid = @openid`).run(merged)
+  return { success: true }
+}
+
+function deletePerson(openid, id) {
+  const tx = db.transaction(() => {
+    db.prepare('DELETE FROM persons WHERE id = ? AND openid = ?').run(id, openid)
+    db.prepare('DELETE FROM anniversaries WHERE personId = ? AND openid = ?').run(id, openid)
+  })
+  tx()
+  return { success: true }
+}
+
+function syncPersons(openid, list) {
+  const tx = db.transaction((items) => {
+    db.prepare('DELETE FROM persons WHERE openid = ?').run(openid)
+    for (const item of items) addPerson(openid, item)
+  })
+  tx(Array.isArray(list) ? list : [])
+  return { success: true, count: Array.isArray(list) ? list.length : 0 }
+}
+
+function getPersons(openid) {
+  const rows = db.prepare('SELECT * FROM persons WHERE openid = ? ORDER BY createTime DESC').all(openid)
+  return { success: true, data: rows }
+}
+
 // 手动触发提醒任务（便于调试，无需等到定点）
 app.post('/api/reminder/run', async (req, res) => {
   try {

server/src/lunar.js

@@ -0,0 +1,212 @@
+/**
+ * 农历日期转换工具
+ * 基于寿星万年历算法（1900-2100年）
+ */
+
+// 农历数据：每条数据记录该年的月份大小和闰月信息
+// 格式：bit 16=闰月大小(1 大月 / 0 小月)，bit 15-4=12 个月大小(1大/0小)，bit 3-0=闰月位置(0 无闰)
+// 数据源：github.com/jjonline/calendar.js（权威，经过修订）
+const lunarInfo = [
+  0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+  0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+  0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+  0x06566, 0x0d4a0, 0x0ea50, 0x16a95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+  0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+  0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+  0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+  0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+  0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+  0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+  0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+  0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+  0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+  0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+  0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+  0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+  0x092e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+  0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+  0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+  0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+  0x0d520                                                                                  // 2100
+]
+
+// 1900年1月31日是农历正月初一（庚子年）
+const BASE_DATE = new Date(1900, 0, 31)
+
+const LUNAR_MONTHS = ['正','二','三','四','五','六','七','八','九','十','冬','腊']
+const LUNAR_DAYS_TENS = ['初','十','廿','三']
+const LUNAR_DAYS_UNITS = ['一','二','三','四','五','六','七','八','九','十']
+
+/**
+ * 获取农历某年的总天数
+ */
+function _lunarYearDays(year) {
+  let total = 348
+  for (let i = 0x8000; i > 0x8; i >>= 1) {
+    total += (lunarInfo[year - 1900] & i) ? 1 : 0
+  }
+  return total + _leapDays(year)
+}
+
+/**
+ * 获取农历某年闰月的天数
+ */
+function _leapDays(year) {
+  if (_leapMonth(year)) {
+    return (lunarInfo[year - 1900] & 0x10000) ? 30 : 29
+  }
+  return 0
+}
+
+/**
+ * 获取农历某年的闰月月份，0表示无闰月
+ */
+function _leapMonth(year) {
+  return lunarInfo[year - 1900] & 0xf
+}
+
+/**
+ * 获取农历某年某月的天数
+ */
+function _monthDays(year, month) {
+  return (lunarInfo[year - 1900] & (0x10000 >> month)) ? 30 : 29
+}
+
+/**
+ * 公历转农历
+ * @param {Date} solarDate
+ * @returns {{ year, month, day, isLeap, lunarText }}
+ */
+function solarToLunar(solarDate) {
+  const date = new Date(solarDate.getFullYear(), solarDate.getMonth(), solarDate.getDate())
+  let offset = Math.round((date - BASE_DATE) / 86400000)
+
+  let lunarYear, lunarMonth, lunarDay
+  let isLeap = false
+
+  for (lunarYear = 1900; lunarYear < 2100 && offset > 0; lunarYear++) {
+    const days = _lunarYearDays(lunarYear)
+    offset -= days
+  }
+  if (offset < 0) {
+    offset += _lunarYearDays(--lunarYear)
+  }
+
+  const leapM = _leapMonth(lunarYear)
+  let isLeapYear = false
+
+  for (lunarMonth = 1; lunarMonth < 13 && offset > 0; lunarMonth++) {
+    if (leapM > 0 && lunarMonth === leapM + 1 && !isLeapYear) {
+      --lunarMonth
+      isLeapYear = true
+      const leapDays = _leapDays(lunarYear)
+      offset -= leapDays
+    } else {
+      offset -= _monthDays(lunarYear, lunarMonth)
+    }
+    if (isLeapYear && lunarMonth === leapM + 1) isLeapYear = false
+  }
+
+  if (offset === 0 && leapM > 0 && lunarMonth === leapM + 1) {
+    if (isLeapYear) {
+      isLeapYear = false
+    } else {
+      isLeapYear = true
+      --lunarMonth
+    }
+  }
+  if (offset < 0) {
+    offset += isLeapYear ? _leapDays(lunarYear) : _monthDays(lunarYear, lunarMonth)
+    if (isLeapYear) isLeapYear = false
+    else --lunarMonth
+  }
+
+  lunarDay = offset + 1
+  isLeap = isLeapYear
+
+  return {
+    year: lunarYear,
+    month: lunarMonth,
+    day: lunarDay,
+    isLeap,
+    lunarText: `${isLeap ? '闰' : ''}${getLunarMonthName(lunarMonth)}月${getLunarDayName(lunarDay)}`
+  }
+}
+
+/**
+ * 农历转公历（指定年份）
+ * @param {Number} lunarYear
+ * @param {Number} lunarMonth
+ * @param {Number} lunarDay
+ * @param {Boolean} isLeap 是否闰月
+ * @returns {Date}
+ */
+function lunarToSolar(lunarYear, lunarMonth, lunarDay, isLeap) {
+  let offset = 0
+
+  for (let y = 1900; y < lunarYear; y++) {
+    offset += _lunarYearDays(y)
+  }
+
+  const leapM = _leapMonth(lunarYear)
+  let hasLeap = false
+
+  for (let m = 1; m < lunarMonth; m++) {
+    if (leapM > 0 && m === leapM && !hasLeap) {
+      offset += _leapDays(lunarYear)
+      hasLeap = true
+    }
+    offset += _monthDays(lunarYear, m)
+  }
+
+  if (isLeap && lunarMonth === leapM) {
+    offset += _monthDays(lunarYear, lunarMonth)
+  }
+
+  offset += lunarDay - 1
+
+  const result = new Date(BASE_DATE.getTime() + offset * 86400000)
+  return result
+}
+
+/**
+ * 获取指定农历月日在今年或明年的公历日期
+ */
+function getNextLunarDate(lunarMonth, lunarDay) {
+  const today = new Date()
+  const currentYear = today.getFullYear()
+  const lunarToday = solarToLunar(today)
+
+  // 尝试今年
+  let candidate = lunarToSolar(lunarToday.year, lunarMonth, lunarDay, false)
+  if (candidate >= today) return candidate
+
+  // 明年
+  return lunarToSolar(lunarToday.year + 1, lunarMonth, lunarDay, false)
+}
+
+function getLunarMonthName(month) {
+  return LUNAR_MONTHS[month - 1] || ''
+}
+
+function getLunarDayName(day) {
+  if (day === 10) return '初十'
+  if (day === 20) return '二十'
+  if (day === 30) return '三十'
+  const tens = Math.floor(day / 10)
+  const units = day % 10
+  return LUNAR_DAYS_TENS[tens] + (units > 0 ? LUNAR_DAYS_UNITS[units - 1] : '')
+}
+
+function formatLunarText(lunarDate) {
+  return solarToLunar(new Date(lunarDate.year, lunarDate.month - 1, lunarDate.day)).lunarText
+}
+
+module.exports = {
+  solarToLunar,
+  lunarToSolar,
+  getNextLunarDate,
+  formatLunarText,
+  getLunarMonthName,
+  getLunarDayName
+}

server/src/reminder.js

@@ -1,6 +1,7 @@
 const cron = require('node-cron')
 const db = require('./db')
 const wx = require('./wx')
+const lunar = require('./lunar')
 
 const TEMPLATE_ID = process.env.WX_TEMPLATE_ID
 const MINIPROGRAM_STATE = process.env.WX_MINIPROGRAM_STATE || 'formal'
@@ -26,9 +27,24 @@ function formatDate(date) {
 }
 
 // 算出"距离今年（或明年）这个纪念日还有多少天"
+// 农历纪念日按 lunarMonth/lunarDay 计算每年对应的公历日期，否则按 solarMonth/solarDay
 function getThisYearDate(anniv) {
   const today = new Date()
   today.setHours(0, 0, 0, 0)
+
+  if (anniv.isLunar && anniv.lunarMonth && anniv.lunarDay) {
+    // 闰月生日按 A 方案处理：若当年无对应闰月，lunarToSolar 内部已自动按普通月份算
+    const todayLunar = lunar.solarToLunar(today)
+    const wantLeap = !!anniv.isLeapMonth
+    let target = lunar.lunarToSolar(todayLunar.year, anniv.lunarMonth, anniv.lunarDay, wantLeap)
+    target.setHours(0, 0, 0, 0)
+    if (target < today) {
+      target = lunar.lunarToSolar(todayLunar.year + 1, anniv.lunarMonth, anniv.lunarDay, wantLeap)
+      target.setHours(0, 0, 0, 0)
+    }
+    return target
+  }
+
   let target = new Date(today.getFullYear(), anniv.solarMonth - 1, anniv.solarDay)
   target.setHours(0, 0, 0, 0)
   if (target < today) {