From 90d32a5121afebed066adf893d5c3e386eca4fed Mon Sep 17 00:00:00 2001
From: Alex-larget <33240357+Alex-larget@users.noreply.github.com>
Date: Sun, 8 Mar 2026 11:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=88=87=E6=8D=A2API=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E5=9C=B0=E5=9D=80=E8=87=B3=E7=9C=9F=E5=AE=9E=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E3=80=82=E5=AE=9E=E7=8E=B0@=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8F=90=E5=8F=8A=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E5=9C=A8=E5=86=85=E5=AE=B9=E4=B8=AD=E6=8F=92=E5=85=A5=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=B9=B6=E9=AB=98=E4=BA=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=E3=80=82=E8=B0=83=E6=95=B4=E5=90=8E=E7=AB=AF=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BB=A5=E6=94=AF=E6=8C=81=E5=85=8D=E8=B4=B9=E7=AB=A0?=
 =?UTF-8?q?=E8=8A=82=E7=9A=84=E5=88=A4=E6=96=AD=EF=BC=8C=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E7=AB=A0=E8=8A=82=E4=BF=A1=E6=81=AF=E7=9A=84=E5=87=86=E7=A1=AE?=
 =?UTF-8?q?=E6=80=A7=E4=B8=8E=E4=B8=80=E8=87=B4=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/app.js                           |   4 +-
 soul-admin/src/pages/content/ContentPage.tsx | 119 ++++++++++++++++++-
 soul-api/internal/handler/book.go            |  72 +++++++++--
 3 files changed, 181 insertions(+), 14 deletions(-)

diff --git a/miniprogram/app.js b/miniprogram/app.js
index a641870e..1abc1ba6 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -8,9 +8,9 @@ const { parseScene } = require('./utils/scene.js')
 App({
   globalData: {
     // API基础地址 - 连接真实后端
-    //  baseUrl: 'https://soulapi.quwanzhi.com',
+     baseUrl: 'https://soulapi.quwanzhi.com',
     // baseUrl: 'https://souldev.quwanzhi.com',
-    baseUrl: 'http://localhost:8080',
+    // baseUrl: 'http://localhost:8080',
     
     
     // 小程序配置 - 真实AppID
diff --git a/soul-admin/src/pages/content/ContentPage.tsx b/soul-admin/src/pages/content/ContentPage.tsx
index 62ef491d..a32ba9b4 100644
--- a/soul-admin/src/pages/content/ContentPage.tsx
+++ b/soul-admin/src/pages/content/ContentPage.tsx
@@ -36,6 +36,7 @@ import {
   Plus,
   Image as ImageIcon,
   Search,
+  AtSign,
 } from 'lucide-react'
 import { get, put, del } from '@/api/client'
 import { ChapterTree } from './ChapterTree'
@@ -156,6 +157,12 @@ export function ContentPage() {
   const [editingPart, setEditingPart] = useState<{ id: string; title: string } | null>(null)
   const [isSavingPartTitle, setIsSavingPartTitle] = useState(false)
 
+  const [showMentionUserDialog, setShowMentionUserDialog] = useState(false)
+  const [mentionTarget, setMentionTarget] = useState<'new' | 'edit'>('new')
+  const [mentionUserList, setMentionUserList] = useState<{ id: string; nickname: string }[]>([])
+  const [mentionUserSearch, setMentionUserSearch] = useState('')
+  const [mentionUserLoading, setMentionUserLoading] = useState(false)
+
   const tree = buildTree(sectionsList)
   const totalSections = sectionsList.length
 
@@ -178,6 +185,43 @@ export function ContentPage() {
     loadList()
   }, [])
 
+  const loadMentionUsers = useCallback(async () => {
+    setMentionUserLoading(true)
+    try {
+      const params = new URLSearchParams({ pageSize: '200' })
+      if (mentionUserSearch.trim()) params.set('search', mentionUserSearch.trim())
+      const data = await get<{ success?: boolean; users?: { id: string; nickname?: string }[] }>(
+        `/api/db/users?${params}`,
+      )
+      const users = Array.isArray(data?.users) ? data.users : []
+      setMentionUserList(users.map((u) => ({ id: String(u.id), nickname: u.nickname || '用户' })))
+    } catch (e) {
+      console.error(e)
+      setMentionUserList([])
+    } finally {
+      setMentionUserLoading(false)
+    }
+  }, [mentionUserSearch])
+
+  useEffect(() => {
+    if (showMentionUserDialog) loadMentionUsers()
+  }, [showMentionUserDialog, loadMentionUsers])
+
+  const openMentionUserDialog = (target: 'new' | 'edit') => {
+    setMentionTarget(target)
+    setMentionUserSearch('')
+    setShowMentionUserDialog(true)
+  }
+
+  const insertMentionUser = (user: { id: string; nickname: string }) => {
+    const snippet = `{{@${user.id}:${user.nickname}}}`
+    if (mentionTarget === 'new') {
+      setNewSection((prev) => ({ ...prev, content: (prev.content || '') + snippet }))
+    } else if (editingSection) {
+      setEditingSection({ ...editingSection, content: (editingSection.content || '') + snippet })
+    }
+    setShowMentionUserDialog(false)
+  }
 
   const togglePart = (partId: string) => {
     setExpandedParts((prev) =>
@@ -563,10 +607,22 @@ export function ContentPage() {
               </div>
             </div>
             <div className="space-y-2">
-              <Label className="text-gray-300">内容 (Markdown格式)</Label>
+              <div className="flex items-center justify-between">
+                <Label className="text-gray-300">内容 (Markdown格式)</Label>
+                <Button
+                  type="button"
+                  variant="outline"
+                  size="sm"
+                  onClick={() => openMentionUserDialog('new')}
+                  className="border-gray-600 text-gray-300 hover:bg-gray-700/50 bg-transparent"
+                >
+                  <AtSign className="w-4 h-4 mr-1" />
+                  插入 @用户
+                </Button>
+              </div>
               <Textarea
                 className="bg-[#0a1628] border-gray-700 text-white min-h-[300px] font-mono text-sm placeholder:text-gray-500"
-                placeholder="输入章节内容..."
+                placeholder="输入章节内容... 可点击「插入 @用户」插入 {{@用户ID:昵称}}，小程序内将高亮可点"
                 value={newSection.content}
                 onChange={(e) => setNewSection({ ...newSection, content: e.target.value })}
               />
@@ -746,6 +802,16 @@ export function ContentPage() {
                 <div className="flex items-center justify-between">
                   <Label className="text-gray-300">内容 (Markdown格式)</Label>
                   <div className="flex gap-2">
+                    <Button
+                      type="button"
+                      variant="outline"
+                      size="sm"
+                      onClick={() => openMentionUserDialog('edit')}
+                      className="border-gray-600 text-gray-300 hover:bg-gray-700/50 bg-transparent"
+                    >
+                      <AtSign className="w-4 h-4 mr-1" />
+                      插入 @用户
+                    </Button>
                     <input
                       ref={imageInputRef}
                       type="file"
@@ -807,6 +873,55 @@ export function ContentPage() {
         </DialogContent>
       </Dialog>
 
+      {/* 插入 @用户 - 选择用户弹窗 */}
+      <Dialog open={showMentionUserDialog} onOpenChange={setShowMentionUserDialog}>
+        <DialogContent className="bg-[#0f2137] border-gray-700 text-white max-w-md max-h-[80vh] overflow-hidden flex flex-col" showCloseButton>
+          <DialogHeader>
+            <DialogTitle className="text-white flex items-center gap-2">
+              <AtSign className="w-5 h-5 text-[#38bdac]" />
+              插入 @用户
+            </DialogTitle>
+          </DialogHeader>
+          <p className="text-gray-400 text-sm">选择用户后，将在内容末尾插入 {'{{@用户ID:昵称}}'}，小程序内会高亮可点击。</p>
+          <div className="space-y-2">
+            <Input
+              className="bg-[#0a1628] border-gray-700 text-white placeholder:text-gray-500"
+              placeholder="搜索昵称或 ID..."
+              value={mentionUserSearch}
+              onChange={(e) => setMentionUserSearch(e.target.value)}
+              onKeyDown={(e) => e.key === 'Enter' && loadMentionUsers()}
+            />
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={loadMentionUsers}
+              disabled={mentionUserLoading}
+              className="border-gray-600 text-gray-300 hover:bg-gray-700/50 bg-transparent w-full"
+            >
+              {mentionUserLoading ? <RefreshCw className="w-4 h-4 animate-spin" /> : <Search className="w-4 h-4" />}
+              {mentionUserLoading ? '加载中...' : '搜索'}
+            </Button>
+          </div>
+          <div className="flex-1 overflow-y-auto min-h-[200px] border border-gray-700 rounded-md bg-[#0a1628]">
+            {mentionUserList.length === 0 && !mentionUserLoading && (
+              <div className="p-4 text-center text-gray-500 text-sm">暂无用户，请调整搜索或先有用户数据</div>
+            )}
+            {mentionUserList.map((user) => (
+              <button
+                key={user.id}
+                type="button"
+                onClick={() => insertMentionUser(user)}
+                className="w-full px-4 py-2 text-left hover:bg-[#38bdac]/20 border-b border-gray-700/50 last:border-0 flex justify-between items-center"
+              >
+                <span className="text-white truncate">{user.nickname}</span>
+                <span className="text-gray-500 text-xs font-mono shrink-0 ml-2">{user.id}</span>
+              </button>
+            ))}
+          </div>
+        </DialogContent>
+      </Dialog>
+
       <Tabs defaultValue="chapters" className="space-y-6">
         <TabsList className="bg-[#0f2137] border border-gray-700/50 p-1">
           <TabsTrigger value="chapters" className="data-[state=active]:bg-[#38bdac]/20 data-[state=active]:text-[#38bdac] text-gray-400">
diff --git a/soul-api/internal/handler/book.go b/soul-api/internal/handler/book.go
index 186795af..fe144d9c 100644
--- a/soul-api/internal/handler/book.go
+++ b/soul-api/internal/handler/book.go
@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"encoding/json"
 	"net/http"
 	"strconv"
 	"strings"
@@ -17,10 +18,11 @@ var excludeParts = []string{"序言", "尾声", "附录"}
 
 // BookAllChapters GET /api/book/all-chapters 返回所有章节（列表，来自 chapters 表）
 // 排序须与管理端 PUT /api/db/book action=reorder 一致：按 sort_order 升序，同序按 id
-// COALESCE 处理 sort_order 为 NULL 的旧数据，避免错位
+// 免费判断：system_config.free_chapters / chapter_config.freeChapters 优先于 chapters.is_free
 // 支持 excludeFixed=1：排除序言、尾声、附录（目录页固定模块，不参与中间篇章）
 func BookAllChapters(c *gin.Context) {
-	q := database.DB().Model(&model.Chapter{})
+	db := database.DB()
+	q := db.Model(&model.Chapter{})
 	if c.Query("excludeFixed") == "1" {
 		for _, p := range excludeParts {
 			q = q.Where("part_title NOT LIKE ?", "%"+p+"%")
@@ -31,6 +33,15 @@ func BookAllChapters(c *gin.Context) {
 		c.JSON(http.StatusOK, gin.H{"success": true, "data": []interface{}{}})
 		return
 	}
+	freeIDs := getFreeChapterIDs(db)
+	for i := range list {
+		if freeIDs[list[i].ID] {
+			t := true
+			z := float64(0)
+			list[i].IsFree = &t
+			list[i].Price = &z
+		}
+	}
 	c.JSON(http.StatusOK, gin.H{"success": true, "data": list})
 }
 
@@ -63,7 +74,43 @@ func BookChapterByMID(c *gin.Context) {
 	})
 }
 
+// getFreeChapterIDs 从 system_config 读取免费章节 ID 列表（free_chapters 或 chapter_config.freeChapters）
+func getFreeChapterIDs(db *gorm.DB) map[string]bool {
+	ids := make(map[string]bool)
+	for _, key := range []string{"free_chapters", "chapter_config"} {
+		var row model.SystemConfig
+		if err := db.Where("config_key = ?", key).First(&row).Error; err != nil {
+			continue
+		}
+		var val interface{}
+		if err := json.Unmarshal(row.ConfigValue, &val); err != nil {
+			continue
+		}
+		if key == "free_chapters" {
+			if arr, ok := val.([]interface{}); ok {
+				for _, v := range arr {
+					if s, ok := v.(string); ok {
+						ids[s] = true
+					}
+				}
+			}
+		} else if key == "chapter_config" {
+			if m, ok := val.(map[string]interface{}); ok {
+				if arr, ok := m["freeChapters"].([]interface{}); ok {
+					for _, v := range arr {
+						if s, ok := v.(string); ok {
+							ids[s] = true
+						}
+					}
+				}
+			}
+		}
+	}
+	return ids
+}
+
 // findChapterAndRespond 按条件查章节并返回统一格式
+// 免费判断优先级：system_config.free_chapters / chapter_config.freeChapters > chapters.is_free/price
 func findChapterAndRespond(c *gin.Context, whereFn func(*gorm.DB) *gorm.DB) {
 	var ch model.Chapter
 	db := database.DB()
@@ -85,14 +132,19 @@ func findChapterAndRespond(c *gin.Context, whereFn func(*gorm.DB) *gorm.DB) {
 		"mid":          ch.MID,
 		"sectionTitle": ch.SectionTitle,
 	}
-	if ch.IsFree != nil {
-		out["isFree"] = *ch.IsFree
-	}
-	if ch.Price != nil {
-		out["price"] = *ch.Price
-		// 价格为 0 元则自动视为免费
-		if *ch.Price == 0 {
-			out["isFree"] = true
+	isFreeFromConfig := getFreeChapterIDs(db)[ch.ID]
+	if isFreeFromConfig {
+		out["isFree"] = true
+		out["price"] = float64(0)
+	} else {
+		if ch.IsFree != nil {
+			out["isFree"] = *ch.IsFree
+		}
+		if ch.Price != nil {
+			out["price"] = *ch.Price
+			if *ch.Price == 0 {
+				out["isFree"] = true
+			}
 		}
 	}
 	c.JSON(http.StatusOK, out)