feat: 新增搜索增加

handlers/public_api_handler.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ctwj/urldb/db/dto"
 	"github.com/ctwj/urldb/db/entity"
 
+	"github.com/ctwj/urldb/utils"
 	"github.com/gin-gonic/gin"
 )
 
@@ -182,6 +183,7 @@ func (h *PublicAPIHandler) SearchResources(c *gin.Context) {
 	keyword := c.Query("keyword")
 	tag := c.Query("tag")
 	category := c.Query("category")
+	panID := c.Query("pan_id")
 	pageStr := c.DefaultQuery("page", "1")
 	pageSizeStr := c.DefaultQuery("page_size", "20")
 
@@ -195,29 +197,88 @@ func (h *PublicAPIHandler) SearchResources(c *gin.Context) {
 		pageSize = 20
 	}
 
-	// 构建搜索条件
-	params := map[string]interface{}{
-		"page":      page,
-		"page_size": pageSize,
+	var resources []entity.Resource
+	var total int64
+
+	// 如果启用了Meilisearch，优先使用Meilisearch搜索
+	if meilisearchManager != nil && meilisearchManager.IsEnabled() {
+		// 构建过滤器
+		filters := make(map[string]interface{})
+		if category != "" {
+			filters["category"] = category
+		}
+		if tag != "" {
+			filters["tags"] = tag
+		}
+		if panID != "" {
+			if id, err := strconv.ParseUint(panID, 10, 32); err == nil {
+				// 根据pan_id获取pan_name
+				pan, err := repoManager.PanRepository.FindByID(uint(id))
+				if err == nil && pan != nil {
+					filters["pan_name"] = pan.Name
+				}
+			}
+		}
+
+		// 使用Meilisearch搜索
+		service := meilisearchManager.GetService()
+		if service != nil {
+			docs, docTotal, err := service.Search(keyword, filters, page, pageSize)
+			if err == nil {
+				// 将Meilisearch文档转换为Resource实体（保持兼容性）
+				for _, doc := range docs {
+					resource := entity.Resource{
+						ID:          doc.ID,
+						Title:       doc.Title,
+						Description: doc.Description,
+						URL:         doc.URL,
+						SaveURL:     doc.SaveURL,
+						FileSize:    doc.FileSize,
+						Key:         doc.Key,
+						PanID:       doc.PanID,
+						CreatedAt:   doc.CreatedAt,
+						UpdatedAt:   doc.UpdatedAt,
+					}
+					resources = append(resources, resource)
+				}
+				total = docTotal
+			} else {
+				utils.Error("Meilisearch搜索失败，回退到数据库搜索: %v", err)
+			}
+		}
 	}
 
-	if keyword != "" {
-		params["search"] = keyword
-	}
+	// 如果Meilisearch未启用或搜索失败，使用数据库搜索
+	if meilisearchManager == nil || !meilisearchManager.IsEnabled() || err != nil {
+		// 构建搜索条件
+		params := map[string]interface{}{
+			"page":      page,
+			"page_size": pageSize,
+		}
 
-	if tag != "" {
-		params["tag"] = tag
-	}
+		if keyword != "" {
+			params["search"] = keyword
+		}
 
-	if category != "" {
-		params["category"] = category
-	}
+		if tag != "" {
+			params["tag"] = tag
+		}
 
-	// 执行搜索
-	resources, total, err := repoManager.ResourceRepository.SearchWithFilters(params)
-	if err != nil {
-		ErrorResponse(c, "搜索失败: "+err.Error(), 500)
-		return
+		if category != "" {
+			params["category"] = category
+		}
+		if panID != "" {
+			if id, err := strconv.ParseUint(panID, 10, 32); err == nil {
+				params["pan_id"] = uint(id)
+			}
+		}
+
+		// 执行数据库搜索
+		resources, total, err = repoManager.ResourceRepository.SearchWithFilters(params)
+		if err != nil {
+			ErrorResponse(c, "搜索失败: "+err.Error(), 500)
+			return
+		}
 	}
 
 	// 过滤违禁词
@@ -242,10 +303,10 @@ func (h *PublicAPIHandler) SearchResources(c *gin.Context) {
 
 	// 构建响应数据
 	responseData := gin.H{
-		"list":  resourceResponses,
-		"total": filteredTotal,
-		"page":  page,
-		"limit": pageSize,
+		"data":      resourceResponses,
+		"total":     filteredTotal,
+		"page":      page,
+		"page_size": pageSize,
 	}
 
 	// 如果存在违禁词过滤，添加提醒字段