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

utils/file/upload.go

@@ -22,6 +22,7 @@ type Upload struct {
 }
 
 type UploadBaseReq struct {
+	Source       string
 	FileHash     string
 	FileData     string
 	Metadata     string
@@ -119,6 +120,7 @@ func (upload *Upload) UploadFileByBase64(req *UploadBaseReq) (*UploadBaseRes, er
 					Metadata:     &req.Metadata,
 					ApiType:      &apiType,
 					BucketName:   bucketName,
+					Source:       &req.Source,
 				}).Error
 				if err != nil {
 					logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")
@@ -212,6 +214,7 @@ func (upload *Upload) UploadFileByByte(req *UploadBaseReq) (*UploadBaseRes, erro
 					Metadata:     &req.Metadata,
 					ApiType:      &apiType,
 					BucketName:   bucketName,
+					Source:       &req.Source,
 				}).Error
 				if err != nil {
 					logx.Errorf("err:%+v，desc:%+v", err, "fail.upload.resourceInfoAdd.mysql")

utils/websocket_data/render_data.go

@@ -28,20 +28,7 @@ type RenderImageRspMsg struct {
 	RenderId string `json:"render_id"` //渲染id
 	Image    string `json:"image"`     //渲染结果图片
 }
-
-// 渲染服务器回调数据
-type RenderImageNotify struct {
-	TaskId string `json:"task_id"`
-	Image  string `json:"image"`
-}
 type ThirdPartyLoginRspMsg struct {
 	//websocket三方登录的通知数据
 	Token string `json:"token"`
 }
-
-// 发送到渲染组装的mq数据
-type AssembleRenderData struct {
-	TaskId     string     `json:"task_id"`
-	RenderId   string     `json:"render_id"`
-	RenderData RenderData `json:"render_data"`
-}