v2版本

internal/api/handler.go

@@ -7,12 +7,13 @@ package api
 
 import (
 	"fmt"
-	"net/http"
+	"strconv"
 	"time"
 	"xk-websocket-v2/internal/manager"
 	"xk-websocket-v2/internal/model"
 	"xk-websocket-v2/internal/service"
 	"xk-websocket-v2/internal/turnserver"
+	"xk-websocket-v2/internal/utils"
 
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/viper"
@@ -33,7 +34,7 @@ func SendHandler(c *gin.Context) {
 	var req model.SendMessageReq
 	// 1. 绑定并校验 JSON 参数
 	if err := c.ShouldBindJSON(&req); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "无效的JSON参数"})
+		utils.BadRequest(c, "无效的JSON参数")
 		return
 	}
 
@@ -63,7 +64,7 @@ func SendHandler(c *gin.Context) {
 	service.ChatSvc.HandleUserMessage(mockClient, &req)
 
 	// 6. 返回成功响应
-	c.JSON(http.StatusOK, gin.H{"status": "ok"})
+	utils.Success(c, "消息已发送")
 }
 
 /**
@@ -89,12 +90,12 @@ func SendToUserHandler(c *gin.Context) {
 func BindHandler(c *gin.Context) {
 	var req model.BindReq
 	if err := c.ShouldBindJSON(&req); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
+		utils.BadRequest(c, "参数错误")
 		return
 	}
 	// 调用服务层进行绑定
 	service.ChatSvc.BindUserByClientID(req.ClientID, req.UserID)
-	c.JSON(http.StatusOK, gin.H{"status": "success"})
+	utils.Success(c, "绑定成功")
 }
 
 /**
@@ -106,7 +107,7 @@ func CheckUserOnlineHandler(c *gin.Context) {
 	userID := c.Query("user_id")
 	// 调用服务层查询 Redis
 	isOnline := service.ChatSvc.IsUserOnline(userID)
-	c.JSON(http.StatusOK, gin.H{"status": "success", "result": isOnline})
+	utils.SuccessWithData(c, gin.H{"is_online": isOnline}, "查询成功")
 }
 
 // ==========================================
@@ -120,18 +121,52 @@ func CheckUserOnlineHandler(c *gin.Context) {
  */
 func HistoryHandler(c *gin.Context) {
 	roomID := c.Query("room_id")
-	var msgs []model.ChatMessage
-
-	// 简单查询最近 50 条
-	// 生产环境应添加 page, page_size 参数
-	result := service.ChatSvc.DB.Where("room_id = ?", roomID).
-		Order("created_at desc").Limit(50).Find(&msgs)
-
-	if result.Error != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "db error"})
+	if roomID == "" {
+		utils.BadRequest(c, "room_id参数必填")
 		return
 	}
-	c.JSON(http.StatusOK, gin.H{"data": msgs})
+
+	// 分页参数
+	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
+	pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "50"))
+
+	if page < 1 {
+		page = 1
+	}
+	if pageSize < 1 || pageSize > 100 {
+		pageSize = 50
+	}
+
+	var msgs []model.ChatMessage
+	var total int64
+
+	// 获取总数
+	service.ChatSvc.DB.Model(&model.ChatMessage{}).Where("room_id = ?", roomID).Count(&total)
+
+	// 分页查询
+	offset := (page - 1) * pageSize
+	result := service.ChatSvc.DB.Where("room_id = ?", roomID).
+		Order("created_at desc").
+		Offset(offset).
+		Limit(pageSize).
+		Find(&msgs)
+
+	if result.Error != nil {
+		utils.InternalError(c, "db error")
+		return
+	}
+
+	// 确保返回空数组而不是null
+	if msgs == nil {
+		msgs = []model.ChatMessage{}
+	}
+
+	utils.SuccessWithData(c, gin.H{
+		"data":  msgs,
+		"total": total,
+		"page":  page,
+		"size":  pageSize,
+	}, "获取成功")
 }
 
 /**
@@ -143,28 +178,6 @@ func SyncMessagesHandler(c *gin.Context) {
 	HistoryHandler(c)
 }
 
-/**
- * ContactListHandler
- * 功能：获取联系人列表 (模拟数据)。
- * 路径：GET /api/contacts
- * 说明：用于前端展示登录后的好友列表。
- */
-func ContactListHandler(c *gin.Context) {
-	// 模拟 10 个用户数据
-	users := []model.UserContact{
-		{ID: "1001", Name: "张三 (我)", Avatar: "张", Desc: "Golang 专家"},
-		{ID: "1002", Name: "李琦 (妻)", Avatar: "李", Desc: "在线"},
-		{ID: "1003", Name: "王医生", Avatar: "医", Desc: "主任医师"},
-		{ID: "1004", Name: "客服小蜜", Avatar: "客", Desc: "全天在线"},
-		{ID: "1005", Name: "技术支持", Avatar: "技", Desc: "请重启试试"},
-		{ID: "1006", Name: "财务小赵", Avatar: "财", Desc: "报销单请提交"},
-		{ID: "1007", Name: "运维阿强", Avatar: "运", Desc: "服务器维护中"},
-		{ID: "1008", Name: "测试小丽", Avatar: "测", Desc: "Bug 太多了"},
-		{ID: "1009", Name: "HR", Avatar: "人", Desc: "本月考勤异常"},
-		{ID: "1010", Name: "老板", Avatar: "老", Desc: "今晚开会"},
-	}
-	c.JSON(http.StatusOK, gin.H{"data": users})
-}
 
 // ==========================================
 // 系统与 WebRTC 接口
@@ -176,11 +189,11 @@ func ContactListHandler(c *gin.Context) {
  * 路径：GET /api/health
  */
 func HealthHandler(c *gin.Context) {
-	c.JSON(http.StatusOK, gin.H{
+	utils.SuccessWithData(c, gin.H{
 		"status": "ok",
 		"node":   viper.GetString("app.node_id"),
 		"time":   time.Now().Format(time.RFC3339),
-	})
+	}, "服务正常")
 }
 
 /**
@@ -205,5 +218,5 @@ func ICEHandler(c *gin.Context) {
 		Username:   username,
 		Credential: credential,
 	}
-	c.JSON(http.StatusOK, gin.H{"data": []model.ICEServerConfig{cfg}})
+	utils.SuccessWithData(c, []model.ICEServerConfig{cfg}, "获取成功")
 }