Merge branch 'main-merge-base-a'

# Conflicts:
#	deploy/dev/docker-compose.yml
#	deploy/dev/envoy.yaml
#	desc/api/dispute.api
#	desc/api/review.api
#	desc/api/search.api

desc/api/search.api

@@ -8,7 +8,7 @@ type (
 	}
 	SearchReq {
 		PageReq
-		Q          string  `form:"q"`
+		Q          string  `form:"q,optional"`
 		MinPrice   float64 `form:"min,optional"`
 		MaxPrice   float64 `form:"max,optional"`
 		OnlyOnline bool    `form:"onlyOnline,optional"`
@@ -18,14 +18,25 @@ type (
 		Items []interface{} `json:"items"` // Mixed items
 		Meta  PageMeta      `json:"meta"`
 	}
+	Favorite {
+		Id         string `json:"id"`
+		UserId     string `json:"userId"`
+		TargetType string `json:"targetType"`
+		TargetId   string `json:"targetId"`
+		CreatedAt  string `json:"createdAt"`
+	}
+	FavoriteListResp {
+		Items []Favorite `json:"items"`
+		Meta  PageMeta   `json:"meta"`
+	}
 	FavoriteReq {
 		TargetType string `json:"targetType"` // player, shop
-		TargetId   int64  `json:"targetId"`
+		TargetId   string `json:"targetId"`
 	}
 	FavoriteCheckReq {
 		PathIDReq
 		TargetType string `form:"targetType"`
-		TargetId   int64  `form:"targetId"`
+		TargetId   string `form:"targetId"`
 	}
 	FavoriteCheckResp {
 		Favorited bool `json:"favorited"`
@@ -53,7 +64,7 @@ service search-api {
 service search-api {
 	@doc "获取收藏列表"
 	@handler ListFavorites
-	get /favorites (PageReq) returns (SearchResp)
+	get /favorites (PageReq) returns (FavoriteListResp)
 
 	@doc "添加收藏"
 	@handler AddFavorite