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/review.api

@@ -3,6 +3,9 @@ syntax = "v1"
 import "common.api"
 
 type (
+	ReviewPathId {
+		Id int64 `path:"id"`
+	}
 	Review {
 		Id           int64  `json:"id"`
 		OrderId      int64  `json:"orderId"`
@@ -18,9 +21,17 @@ type (
 		Meta  PageMeta `json:"meta"`
 	}
 	SubmitReviewReq {
+		ReviewPathId
 		Rating  int    `json:"rating"`
 		Content string `json:"content,optional"`
 	}
+	GetOrderReviewsReq {
+		ReviewPathId
+	}
+	ListUserReviewsReq {
+		ReviewPathId
+		PageReq
+	}
 )
 
 @server (
@@ -34,7 +45,7 @@ service review-api {
 
 	@doc "获取订单评价"
 	@handler GetOrderReviews
-	get /orders/:id/reviews (EmptyResp) returns ([]Review)
+	get /orders/:id/reviews (GetOrderReviewsReq) returns (ReviewListResp)
 }
 
 @server (
@@ -48,5 +59,5 @@ service review-api {
 
 	@doc "获取用户收到的评价"
 	@handler ListUserReviews
-	get /users/:id/reviews (PageReq) returns (ReviewListResp)
+	get /users/:id/reviews (ListUserReviewsReq) returns (ReviewListResp)
 }