fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
eson 2023-08-21 19:07:22 +08:00
commit 6284fdad38
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/upload/internal/logic/uploadlogologic.go
View File

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

2
server/websocket/internal/logic/ws_render_image_logic.go
View File

@ -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) res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
if err != nil { if err != nil {
logx.Error("合成刀版图失败:", err) logx.Error("合成刀版图失败,合成请求数据:", combineReq, "错误信息:", err)
return err return err
} }
combineImage := "" //刀版图 combineImage := "" //刀版图