diff --git a/api/collect.go b/api/collect.go
index ebb582d..8d876c4 100644
--- a/api/collect.go
+++ b/api/collect.go
@@ -5,12 +5,13 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"regexp"
 	"strings"
 	"time"
 
+	"github.com/doug-martin/goqu/v9"
 	"github.com/graphql-go/graphql"
 	"github.com/thoas/go-funk"
-	"gorm.io/gorm/clause"
 )
 
 type Cover struct {
@@ -101,29 +102,123 @@ var CollectionItems = &graphql.Field{
 			limit = p.Args["first"].(int)
 		}
 
-		order := clause.OrderByColumn{
-			Column: clause.Column{Name: p.Args["sort"].(string)},
-			Desc:   p.Args["order"].(string) == "DESC",
+		//order := clause.OrderByColumn{
+		//	Column: clause.Column{Name: p.Args["sort"].(string)},
+		//	Desc:   p.Args["order"].(string) == "DESC",
+		//}
+
+		var query = goqu.Dialect("mysql").From("web_member_explorer")
+
+		// 筛选条件
+		for _, format := range []string{"id", "title", "type"} {
+			if p.Args[format] != nil {
+				query = query.Where(goqu.C(format).Eq(p.Args[format]))
+			}
 		}
 
-		if err := db.Limit(limit).Preload("User").Order(order).Find(&collects).Error; err != nil {
-			fmt.Println(err.Error())
+		// 如果没有外部排序则使用指定排序(正则sort只能是字母数字下划下)
+		if p.Args["text"] == nil && p.Args["similar"] == nil && p.Args["interest"] == nil {
+			sort := regexp.MustCompile(`[^a-zA-Z0-9_]`).ReplaceAllString(p.Args["sort"].(string), "")
+			query = query.Select("web_member_explorer.id", goqu.L(
+				fmt.Sprintf("ROW_NUMBER() OVER(ORDER BY web_member_explorer.%s %s)", sort, p.Args["order"]),
+			).As("row_num"))
+		} else {
+			// 排序条件
+			if p.Args["sort"] != nil {
+				if p.Args["order"].(string) == "ASC" {
+					query = query.Order(goqu.C(p.Args["sort"].(string)).Asc())
+				}
+				if p.Args["order"].(string) == "DESC" {
+					query = query.Order(goqu.C(p.Args["sort"].(string)).Desc())
+				}
+			}
+		}
+
+		// 取所有数据的前N条
+		sql, _, _ := query.ToSQL()
+
+		// 遊標截取篩選結果集的前N条
+		var cursor string
+		if p.Args["after"] != nil {
+			cursor = fmt.Sprintf(`WHERE row_num > (SELECT row_num FROM RankedArticles WHERE RankedArticles.id = %d)`, p.Args["after"].(int))
+		}
+
+		// 字段选择
+		var user_id = p.Context.Value("user_id").(int)
+		//var fields = ListItem(p.Info.FieldASTs[0].SelectionSet.Selections)
+		//var praise, praise_join, collect, collect_join, text_count string
+		//if funk.Contains(fields, "praise") {
+		//	praise = ",CASE WHEN web_praise.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_praise"
+		//	praise_join = fmt.Sprintf("LEFT JOIN web_praise ON web_praise.praise_id = web_article.id AND web_praise.user_id = %d AND web_praise.type = 0", user_id)
+		//}
+		//if funk.Contains(fields, "collect") {
+		//	collect = ",CASE WHEN web_collect.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_collect"
+		//	collect_join = fmt.Sprintf("LEFT JOIN web_collect ON web_collect.collect_id = web_article.id AND web_collect.user_id = %d AND web_collect.type = 0", user_id)
+		//}
+
+		var items = ListItem(p.Info.FieldASTs[0].SelectionSet.Selections)
+		var fan, fan_join string
+		if funk.Contains(items, "fan") {
+			fan = ",CASE WHEN web_fans.id IS NOT NULL THEN TRUE ELSE FALSE END AS fan"
+			fan_join = fmt.Sprintf("LEFT JOIN web_fans ON web_fans.follower_id = %d AND web_fans.blogger_id = web_member_explorer.id AND web_fans.type = 3", user_id)
+			//fan = fmt.Sprintf(",(SELECT COUNT(*) FROM web_fans WHERE follower_id = %d AND blogger_id = web_member_explorer.id AND type = 3) AS fan", user_id)
+		}
+
+		sql = fmt.Sprintf(`
+		WITH RankedArticles AS (%s)
+		SELECT web_member_explorer.* %s FROM web_member_explorer INNER JOIN(
+			SELECT id, row_num FROM RankedArticles %s
+		) AS LimitedRanked ON LimitedRanked.id = web_member_explorer.id %s
+		ORDER BY LimitedRanked.row_num ASC LIMIT %d
+		`, sql, fan, cursor, fan_join, limit)
+
+		fmt.Println(sql)
+
+		if err := db.Raw(sql).Scan(&collects).Error; err != nil {
+			fmt.Println("获取游戏列表失败", err)
 			return nil, err
 		}
 
-		var items = ListItem(p.Info.FieldASTs[0].SelectionSet.Selections)
-		if funk.Contains(items, "fan") {
-			var user_id = p.Context.Value("user_id").(int)
-			for index, item := range collects {
-				var total int64
-				if err := db.Table("web_fans").Where("follower_id = ? AND blogger_id = ? AND type = 3", user_id, item.ID).Count(&total).Error; err != nil {
-					fmt.Println(index, err.Error())
-					return nil, err
+		if funk.Contains(items, "user") {
+			var ids []int
+			for _, collect := range collects {
+				ids = append(ids, collect.UserId)
+			}
+			ids = funk.UniqInt(ids)
+
+			var users []User
+			if err := db.Table("web_member").Where("id in (?)", ids).Find(&users).Error; err != nil {
+				fmt.Println("获取用户信息失败", err)
+				return nil, err
+			}
+
+			for index, game := range collects {
+				for _, user := range users {
+					if game.UserId == user.ID {
+						collects[index].User = user
+						break
+					}
 				}
-				collects[index].Fan = total > 0
 			}
 		}
 
+		//if err := db.Limit(limit).Preload("User").Order(order).Find(&collects).Error; err != nil {
+		//	fmt.Println(err.Error())
+		//	return nil, err
+		//}
+
+		//if funk.Contains(items, "fan") {
+		//	var user_id = p.Context.Value("user_id").(int)
+		//	for index, item := range collects {
+		//		var total int64
+		//		if err := db.Table("web_fans").Where("follower_id = ? AND blogger_id = ? AND type = 3", user_id, item.ID).Count(&total).Error; err != nil {
+		//			fmt.Println(index, err.Error())
+		//			return nil, err
+		//		}
+		//		collects[index].Fan = total > 0
+		//	}
+		//}
+
 		for index, item := range collects {
 			var data []Cover
 			var t string = "article"