优化首页分页和图片上传

backend/internal/modules/listing/handler.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net/http"
 	"strconv"
+	"strings"
 
 	"hfb_sys/backend/internal/middleware"
 	filemodule "hfb_sys/backend/internal/modules/file"
@@ -196,12 +197,12 @@ func (h *Handler) Offline(c *gin.Context) {
 }
 
 func (h *Handler) ListPublic(c *gin.Context) {
-	items, err := h.service.ListPublic()
+	items, err := h.service.ListPublic(parsePublicListQuery(c))
 	if err != nil {
 		writeListingError(c, err)
 		return
 	}
-	response.OK(c, gin.H{"items": items})
+	response.OK(c, items)
 }
 
 func (h *Handler) FindPublic(c *gin.Context) {
@@ -227,7 +228,7 @@ func (h *Handler) Cover(c *gin.Context) {
 		writeListingError(c, err)
 		return
 	}
-	h.writePublicObject(c, key)
+	h.writePublicObject(c, filemodule.ImageVariantFallbackKeys(key, filemodule.ImageVariantThumb)...)
 }
 
 func (h *Handler) Screenshot(c *gin.Context) {
@@ -245,16 +246,23 @@ func (h *Handler) Screenshot(c *gin.Context) {
 		writeListingError(c, err)
 		return
 	}
-	h.writePublicObject(c, key)
+	h.writePublicObject(c, filemodule.ImageVariantFallbackKeys(key, filemodule.ImageVariantMedium)...)
 }
 
-func (h *Handler) writePublicObject(c *gin.Context, key string) {
+func (h *Handler) writePublicObject(c *gin.Context, keys ...string) {
 	if h.storage == nil {
 		response.ServiceUnavailable(c, "文件存储未连接")
 		return
 	}
-	object, err := h.storage.Get(c.Request.Context(), key)
-	if err != nil {
+	var object *filemodule.Object
+	for _, key := range keys {
+		nextObject, err := h.storage.Get(c.Request.Context(), key)
+		if err == nil {
+			object = nextObject
+			break
+		}
+	}
+	if object == nil {
 		response.Error(c, http.StatusNotFound, "not_found", "图片不存在或暂不可访问")
 		return
 	}
@@ -368,6 +376,124 @@ func parseAdminListQuery(c *gin.Context) (AdminListQuery, bool) {
 	return query, true
 }
 
+func parsePublicListQuery(c *gin.Context) PublicListQuery {
+	query := PublicListQuery{
+		Page:           parsePositiveInt(c.DefaultQuery("page", "1"), 1),
+		PageSize:       parsePositiveInt(c.DefaultQuery("page_size", "20"), 20),
+		Keyword:        strings.TrimSpace(c.Query("keyword")),
+		Sort:           strings.TrimSpace(c.Query("sort")),
+		Zone:           strings.TrimSpace(c.Query("zone")),
+		Server:         parseCSVQuery(c.Query("server")),
+		Region:         parseCSVQuery(c.Query("region")),
+		LoginMethod:    parseCSVQuery(firstNonEmpty(c.Query("login_method"), c.Query("login"))),
+		Rank:           parseCSVQuery(c.Query("rank")),
+		Insurance:      parseCSVQuery(c.Query("insurance")),
+		Stamina:        parseCSVQuery(c.Query("stamina")),
+		Load:           parseCSVQuery(c.Query("load")),
+		SkinGroup:      parseCSVQuery(c.Query("skin_group")),
+		SkinName:       parseCSVQuery(firstNonEmpty(c.Query("skin_name"), c.Query("skin"))),
+		MinCoin:        parseOptionalFloat(c.Query("min_coin")),
+		MaxCoin:        parseOptionalFloat(c.Query("max_coin")),
+		MinPrice:       parseOptionalFloat(c.Query("min_price")),
+		MaxPrice:       parseOptionalFloat(c.Query("max_price")),
+		MinDeposit:     parseOptionalFloat(c.Query("min_deposit")),
+		MaxDeposit:     parseOptionalFloat(c.Query("max_deposit")),
+		MinTotal:       parseOptionalFloat(c.Query("min_total")),
+		MaxTotal:       parseOptionalFloat(c.Query("max_total")),
+		MinFireLevel:   parseOptionalFloat(c.Query("min_fire_level")),
+		MaxFireLevel:   parseOptionalFloat(c.Query("max_fire_level")),
+		MinSecretKD:    parseOptionalFloat(c.Query("min_secret_kd")),
+		MaxSecretKD:    parseOptionalFloat(c.Query("max_secret_kd")),
+		ResourceRanges: parseResourceRanges(c),
+	}
+	if query.PageSize > 50 {
+		query.PageSize = 50
+	}
+	return query
+}
+
+func parsePositiveInt(value string, fallback int) int {
+	parsed, err := strconv.Atoi(strings.TrimSpace(value))
+	if err != nil || parsed <= 0 {
+		return fallback
+	}
+	return parsed
+}
+
+func parseOptionalFloat(value string) *float64 {
+	value = strings.TrimSpace(value)
+	if value == "" {
+		return nil
+	}
+	parsed, err := strconv.ParseFloat(value, 64)
+	if err != nil {
+		return nil
+	}
+	return &parsed
+}
+
+func parseCSVQuery(value string) []string {
+	parts := strings.Split(value, ",")
+	result := make([]string, 0, len(parts))
+	seen := make(map[string]struct{}, len(parts))
+	for _, part := range parts {
+		part = strings.TrimSpace(part)
+		if part == "" {
+			continue
+		}
+		if _, ok := seen[part]; ok {
+			continue
+		}
+		seen[part] = struct{}{}
+		result = append(result, part)
+	}
+	return result
+}
+
+func parseResourceRanges(c *gin.Context) map[string]NumberRange {
+	ranges := make(map[string]NumberRange)
+	for key, values := range c.Request.URL.Query() {
+		if !strings.HasPrefix(key, "resource_") {
+			continue
+		}
+		var resourceKey string
+		var isMin bool
+		switch {
+		case strings.HasSuffix(key, "_min"):
+			resourceKey = strings.TrimSuffix(strings.TrimPrefix(key, "resource_"), "_min")
+			isMin = true
+		case strings.HasSuffix(key, "_max"):
+			resourceKey = strings.TrimSuffix(strings.TrimPrefix(key, "resource_"), "_max")
+		default:
+			continue
+		}
+		if resourceKey == "" || len(values) == 0 {
+			continue
+		}
+		value := parseOptionalFloat(values[0])
+		if value == nil {
+			continue
+		}
+		numberRange := ranges[resourceKey]
+		if isMin {
+			numberRange.Min = value
+		} else {
+			numberRange.Max = value
+		}
+		ranges[resourceKey] = numberRange
+	}
+	return ranges
+}
+
+func firstNonEmpty(values ...string) string {
+	for _, value := range values {
+		if strings.TrimSpace(value) != "" {
+			return value
+		}
+	}
+	return ""
+}
+
 func writeListingError(c *gin.Context, err error) {
 	switch {
 	case errors.Is(err, ErrDependencyUnavailable):