Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

service/repositories/image_handle.go

@@ -339,10 +339,10 @@ type (
 		Proportion string `json:"proportion"`
 	}
 	LogoStandardRes struct {
-		ResourceId      string
-		ResourceUrl     string
-		IsmaxProportion bool
-		ImgColor        []string
+		ResourceId      string   `json:"resource_id"`
+		ResourceUrl     string   `json:"resource_url"`
+		IsmaxProportion bool     `json:"ismax_proportion"`
+		ImgColor        []string `json:"img_color"`
 	}
 	LogoStandardMetaData struct {
 		Param  LogoStandardReq `json:"param"`

utils/file/upload.go

@@ -22,17 +22,17 @@ type Upload struct {
 }
 
 type UploadBaseReq struct {
-	ResourceId   string
-	Refresh      int64
-	Source       string
-	FileHash     string
-	FileData     string
-	Metadata     string
-	UploadBucket int64
-	ApiType      int64
-	UserId       int64
-	GuestId      int64
-	FileByte     []byte
+	ResourceId   string `json:"resource_id"`
+	Refresh      int64  `json:"refresh"`
+	Source       string `json:"source"`
+	FileHash     string `json:"file_hash"`
+	FileData     string `json:"file_data"`
+	Metadata     string `json:"metadata"`
+	UploadBucket int64  `json:"upload_bucket"`
+	ApiType      int64  `json:"api_type"`
+	UserId       int64  `json:"user_id"`
+	GuestId      int64  `json:"guest_id"`
+	FileByte     []byte `json:"file_byte"`
 }
 
 type UploadBaseRes struct {

utils/pay/pay.go

@@ -4,7 +4,7 @@ import "fusenapi/constants"
 
 type Config struct {
 	// stripe支付
-	Stripe Stripe
+	Stripe Stripe `json:"stripe"`
 }
 
 // NewPayDriver 实例化方法

utils/pay/stripe.go

@@ -107,8 +107,8 @@ func (stripePay *Stripe) GeneratePrepayment(req *GeneratePrepaymentReq) (res *Ge
 }
 
 type resultPayment struct {
-	Url          string
-	SessionId    string
-	TradeNo      string
-	ClientSecret string
+	Url          string `json:"url"` // 生成预付款链接
+	SessionId    string `json:"session_id"`
+	TradeNo      string `json:"trade_no"`
+	ClientSecret string `json:"client_secret"`
 }