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

server/upload/internal/logic/uploadlogologic.go

@@ -96,10 +96,10 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us
 	}
 
 	// 限制上传文件大小 50k
-	maxSize := 100 * 1024
-	if fileHeader.Size > int64(maxSize) {
-		return resp.SetStatus(basic.CodeFileUploadErr, "file upload err,The file size exceeds the maximum limit of 100k")
-	}
+	// maxSize := 100 * 1024
+	// if fileHeader.Size > int64(maxSize) {
+	// 	return resp.SetStatus(basic.CodeFileUploadErr, "file upload err,The file size exceeds the maximum limit of 100k")
+	// }
 
 	// 读取数据流
 	ioData, err := io.ReadAll(fileObject)

server/websocket/internal/logic/ws_render_image_logic.go

@@ -198,7 +198,7 @@ func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.Re
 	}
 	res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
 	if err != nil {
-		logx.Error("合成刀版图失败:", err)
+		logx.Error("合成刀版图失败,合成请求数据:", combineReq, "错误信息:", err)
 		return err
 	}
 	combineImage := "" //刀版图