Merge branch 'yongpxu-soul' of https://github.com/fnvtk/Mycontent into yongpxu-soul

# Conflicts: # .cursorrules resolved by yongpxu-soul version # miniprogram/app.json resolved by yongpxu-soul version # miniprogram/pages/index/index.js resolved by yongpxu-soul version # miniprogram/pages/index/index.wxml resolved by yongpxu-soul version # miniprogram/pages/my/my.js resolved by yongpxu-soul version # miniprogram/pages/my/my.wxml resolved by yongpxu-soul version # miniprogram/pages/my/my.wxss resolved by yongpxu-soul version # miniprogram/pages/settings/settings.js resolved by yongpxu-soul version # miniprogram/pages/settings/settings.wxml resolved by yongpxu-soul version # miniprogram/上传小程序.py resolved by yongpxu-soul version # next-project/app/admin/error.tsx resolved by yongpxu-soul version # next-project/app/admin/page.tsx resolved by yongpxu-soul version # next-project/app/api/book/all-chapters/route.ts resolved by yongpxu-soul version # next-project/lib/admin-auth.ts resolved by yongpxu-soul version # next-project/lib/db.ts resolved by yongpxu-soul version # next-project/lib/password.ts resolved by yongpxu-soul version # next-project/package.json resolved by yongpxu-soul version # next-project/scripts/.env.feishu.example resolved by yongpxu-soul version # next-project/scripts/fix_souladmin_login.sh resolved by yongpxu-soul version # next-project/scripts/send_poster_to_feishu.py resolved by yongpxu-soul version # next-project/scripts/upload_soul_article.sh resolved by yongpxu-soul version # soul-admin/dist/assets/index-CbOmKBRd.js resolved by yongpxu-soul version # soul-admin/dist/index.html resolved by yongpxu-soul version # 开发文档/10、项目管理/产研团队第21场 20260129 许永平.txt resolved by yongpxu-soul version # 开发文档/5、接口/配置清单-完整版.md resolved by yongpxu-soul version # 开发文档/服务器管理/references/端口配置表.md resolved by yongpxu-soul version
2026-02-24 09:42:34 +08:00
parent bb62e887b3 afc2376e96
commit df723b7eda
46 changed files with 3486 additions and 110 deletions
--- a/next-project/app/api/db/book/route.ts
+++ b/next-project/app/api/db/book/route.ts
@@ -146,13 +146,40 @@ export async function GET(request: NextRequest) {
    }
    
    // 列出所有章节（不含内容）
+    // 优先从数据库读取，确保新建章节能立即显示
    if (action === 'list') {
+      const sectionsFromDb = new Map<string, any>()
+      try {
+        const rows = await query(`
+          SELECT id, part_id, part_title, chapter_id, chapter_title, section_title, 
+                 price, is_free, content
+          FROM chapters ORDER BY part_id, chapter_id, id
+        `) as any[]
+        if (rows && rows.length > 0) {
+          for (const r of rows) {
+            sectionsFromDb.set(r.id, {
+              id: r.id,
+              title: r.section_title || '',
+              price: r.price ?? 1,
+              isFree: !!r.is_free,
+              partId: r.part_id || 'part-1',
+              partTitle: r.part_title || '',
+              chapterId: r.chapter_id || 'chapter-1',
+              chapterTitle: r.chapter_title || '',
+              filePath: ''
+            })
+          }
+        }
+      } catch (e) {
+        console.log('[Book API] list 从数据库读取失败，回退到 bookData:', (e as Error).message)
+      }
+      // 合并：以数据库为准，数据库没有的用 bookData 补
      const sections: any[] = []
-      
      for (const part of bookData) {
        for (const chapter of part.chapters) {
          for (const section of chapter.sections) {
-            sections.push({
+            const dbRow = sectionsFromDb.get(section.id)
+            sections.push(dbRow || {
              id: section.id,
              title: section.title,
              price: section.price,
@@ -163,14 +190,25 @@ export async function GET(request: NextRequest) {
              chapterTitle: chapter.title,
              filePath: section.filePath
            })
+            sectionsFromDb.delete(section.id)
          }
        }
      }
-      
+      // 数据库有但 bookData 没有的（新建章节）
+      for (const [, v] of sectionsFromDb) {
+        sections.push(v)
+      }
+      // 按 id 去重，避免数据库重复或合并逻辑导致同一文章出现多次
+      const seen = new Set<string>()
+      const deduped = sections.filter((s) => {
+        if (seen.has(s.id)) return false
+        seen.add(s.id)
+        return true
+      })
      return NextResponse.json({
        success: true,
-        sections,
-        total: sections.length
+        sections: deduped,
+        total: deduped.length
      })
    }
    
@@ -324,7 +362,7 @@ export async function POST(request: NextRequest) {
 export async function PUT(request: NextRequest) {
  try {
    const body = await request.json()
-    const { id, title, content, price, saveToFile = true } = body
+    const { id, title, content, price, saveToFile = true, partId, chapterId, partTitle, chapterTitle, isFree } = body
    
    if (!id) {
      return NextResponse.json({
@@ -334,28 +372,40 @@ export async function PUT(request: NextRequest) {
    }
    
    const sectionInfo = getSectionInfo(id)
+    const finalPartId = partId || sectionInfo?.partId || 'part-1'
+    const finalPartTitle = partTitle || sectionInfo?.partTitle || '未分类'
+    const finalChapterId = chapterId || sectionInfo?.chapterId || 'chapter-1'
+    const finalChapterTitle = chapterTitle || sectionInfo?.chapterTitle || '未分类'
+    const finalPrice = price ?? sectionInfo?.section?.price ?? 1
+    const finalIsFree = isFree ?? sectionInfo?.section?.isFree ?? false
    
-    // 更新数据库
+    // 更新数据库（含新建章节）
    try {
      await query(`
-        INSERT INTO chapters (id, part_id, part_title, chapter_id, chapter_title, section_title, content, word_count, price, status)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'published')
+        INSERT INTO chapters (id, part_id, part_title, chapter_id, chapter_title, section_title, content, word_count, is_free, price, status)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'published')
        ON DUPLICATE KEY UPDATE 
+          part_id = VALUES(part_id),
+          part_title = VALUES(part_title),
+          chapter_id = VALUES(chapter_id),
+          chapter_title = VALUES(chapter_title),
          section_title = VALUES(section_title),
          content = VALUES(content),
          word_count = VALUES(word_count),
+          is_free = VALUES(is_free),
          price = VALUES(price),
          updated_at = CURRENT_TIMESTAMP
      `, [
        id,
-        sectionInfo?.partId || 'part-1',
-        sectionInfo?.partTitle || '未分类',
-        sectionInfo?.chapterId || 'chapter-1',
-        sectionInfo?.chapterTitle || '未分类',
-        title || sectionInfo?.section.title || '',
+        finalPartId,
+        finalPartTitle,
+        finalChapterId,
+        finalChapterTitle,
+        title || sectionInfo?.section?.title || '',
        content || '',
        (content || '').length,
-        price ?? sectionInfo?.section.price ?? 1
+        finalIsFree,
+        finalPrice
      ])
    } catch (e) {
      console.error('[Book API] 更新数据库失败:', e)
--- a/next-project/app/api/db/migrate/route.ts
+++ b/next-project/app/api/db/migrate/route.ts
@@ -115,6 +115,47 @@ export async function POST(request: NextRequest) {
      }
    }
    
+    // VIP会员字段
+    if (!migration || migration === 'vip_fields') {
+      const vipFields = [
+        { name: 'is_vip', def: "BOOLEAN DEFAULT FALSE COMMENT 'VIP会员'" },
+        { name: 'vip_expire_date', def: "TIMESTAMP NULL COMMENT 'VIP到期时间'" },
+        { name: 'vip_name', def: "VARCHAR(100) COMMENT '会员真实姓名'" },
+        { name: 'vip_project', def: "VARCHAR(200) COMMENT '会员项目名称'" },
+        { name: 'vip_contact', def: "VARCHAR(100) COMMENT '会员联系方式'" },
+        { name: 'vip_avatar', def: "VARCHAR(500) COMMENT '会员展示头像'" },
+        { name: 'vip_bio', def: "VARCHAR(500) COMMENT '会员简介'" },
+      ]
+      let addedCount = 0
+      let existCount = 0
+      for (const field of vipFields) {
+        try {
+          await query(`SELECT ${field.name} FROM users LIMIT 1`)
+          existCount++
+        } catch {
+          try {
+            await query(`ALTER TABLE users ADD COLUMN ${field.name} ${field.def}`)
+            addedCount++
+          } catch (e: any) {
+            if (e.code !== 'ER_DUP_FIELDNAME') {
+              results.push(`⚠️ 添加VIP字段 ${field.name} 失败: ${e.message}`)
+            }
+          }
+        }
+      }
+
+      // 扩展 orders.product_type 支持 vip
+      try {
+        await query(`ALTER TABLE orders MODIFY COLUMN product_type ENUM('section', 'fullbook', 'match', 'vip') NOT NULL`)
+        results.push('✅ orders.product_type 已支持 vip')
+      } catch (e: any) {
+        results.push('ℹ️ orders.product_type 更新跳过: ' + e.message)
+      }
+
+      if (addedCount > 0) results.push(`✅ VIP字段新增 ${addedCount} 个`)
+      if (existCount > 0) results.push(`ℹ️ VIP字段已有 ${existCount} 个存在`)
+    }
+
    // 用户标签定义表
    if (!migration || migration === 'user_tag_definitions') {
      try {
@@ -189,7 +230,7 @@ export async function GET() {
    
    // 检查用户表字段
    const userFields: Record<string, boolean> = {}
-    const checkFields = ['ckb_user_id', 'ckb_synced_at', 'ckb_tags', 'tags', 'merged_tags']
+    const checkFields = ['ckb_user_id', 'ckb_synced_at', 'ckb_tags', 'tags', 'merged_tags', 'is_vip', 'vip_expire_date', 'vip_name']
    
    for (const field of checkFields) {
      try {