Merge branch 'develop' into feature/auth

server_api/product.api

@@ -301,6 +301,7 @@ type GetRecommandProductListRsp {
 type GetTagProductListReq {
 	Cid         int64  `form:"cid,optional"`          //分类id
 	Size        uint32 `form:"size,optional"`         //尺寸
+	TemplateTag string `form:"template_tag,optional"` //模板标签
 	WithProduct bool   `form:"with_product,optional"` //是否携带分类下的产品
 }
 type GetTagProductListRsp {
@@ -325,6 +326,7 @@ type TagProduct {
 	MinPrice  int64  `json:"min_price"`
 	//彩膜列表
 	CoverDefault        []CoverDefaultItem `json:"cover_default"`
+	DefaultTemplateId   int64              `json:"default_template_id"`
 	HaveOptionalFitting bool               `json:"have_optional_fitting"`
 	Recommended         bool               `json:"recommended"`
 }
@@ -385,9 +387,9 @@ type GetSizeByPidRsp {
 }
 //获取产品模板
 type GetTemplateByPidReq {
-	Pid                  string `form:"pid"`
-	ProductSizeId        int64  `form:"product_size_id,optional"`
-	ProductTemplateTagId int64  `form:"product_template_tag_id"`
+	Pid           string `form:"pid"`
+	ProductSizeId int64  `form:"product_size_id,optional"`
+	TemplateTag   string `form:"template_tag"`
 }
 //获取产品配件数据
 type GetFittingByPidReq {

server_api/resource.api

@@ -13,10 +13,23 @@ service resource {
 	@handler LogoCombineHandler
 	post /api/resource/logo-combine(LogoCombineReq) returns (response);
 
+	@handler LogoRemovebgHandler
+	post /api/resource/logo-removebg(LogoRemovebgReq) returns (response);
+
 	@handler ResourceInfoHandler
 	get /api/resource/info(ResourceInfoReq) returns (response);
 }
 
+type (
+	LogoRemovebgReq {
+		IsRemoveBg string `form:"is_remove_bg"`
+		LogoFile   string `form:"logo_file"`
+		Width      string `form:"width"`
+		Height     string `form:"height"`
+		Proportion int64  `form:"proportion"`
+	}
+)
+
 type (
 	ResourceInfoReq {
 		ResourceId  string `form:"resource_id,optional"`  // 资源ID

server_api/upload.api

@@ -42,8 +42,21 @@ service upload {
 	@handler UploadFileBaseHandler
 	post /api/upload/upload-file-base(UploadFileBaseReq) returns (response);
 
+	@handler UploadLogoStandardHandler
+	post /api/upload/up-standard-logo(UploadLogoStandardReq) returns (response);
+
 }
 
+type (
+	UploadLogoStandardReq {
+		IsRemoveBg string `form:"is_remove_bg"`
+		LogoFile   string `form:"logo_file"`
+		Width      string `form:"width"`
+		Height     string `form:"height"`
+		Proportion int64  `form:"proportion"`
+	}
+)
+
 type (
 	UploadFileBaseReq {
 		ApiType      int64  `form:"api_type,options=[1,2],default=1"`      // 调用类型：1=对外，2=对内