From cd449c1c6e3bfdddcadef8a2ca74725d47536800 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 30 Oct 2023 18:06:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=A0=E7=94=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/websocket/internal/logic/ws_render_image.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go index 2819687e..24818210 100644 --- a/server/websocket/internal/logic/ws_render_image.go +++ b/server/websocket/internal/logic/ws_render_image.go @@ -159,8 +159,8 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe w.renderErrResponse(renderImageData.RequestId, renderImageData.RenderData.TemplateTag, "", "请传入正确的合图分辨率格式", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0) return } - if resolution < 512 || resolution > 2048 { - w.renderErrResponse(renderImageData.RequestId, renderImageData.RenderData.TemplateTag, "", "请传入正确的合图分辨率范围值(512~2048)", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0) + if resolution < 100 || resolution > 800 { + w.renderErrResponse(renderImageData.RequestId, renderImageData.RenderData.TemplateTag, "", "请传入正确的合图分辨率范围值(100~800)", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0) return } lenColor := len(renderImageData.RenderData.TemplateTagColor.Colors) From 2970f368bc2cd6da0c80d154c9c1222af1763b1c Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 30 Oct 2023 18:24:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=A0=E7=94=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/ws_allocation_processing_factory.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/server/websocket/internal/logic/ws_allocation_processing_factory.go b/server/websocket/internal/logic/ws_allocation_processing_factory.go index 9ba718cc..7fedddc1 100644 --- a/server/websocket/internal/logic/ws_allocation_processing_factory.go +++ b/server/websocket/internal/logic/ws_allocation_processing_factory.go @@ -10,20 +10,14 @@ type allocationProcessorFactory interface { allocationMessage(w *wsConnectItem, data []byte) } -var mapAllocationProcessor = make(map[constants.Websocket]allocationProcessorFactory) +// 要添加分发在这里 +var mapAllocationProcessor = map[constants.Websocket]allocationProcessorFactory{ + constants.WEBSOCKET_RENDER_IMAGE: &renderProcessor{}, //渲染工厂 +} func (w *wsConnectItem) newAllocationProcessor(msgType constants.Websocket) allocationProcessorFactory { if val, ok := mapAllocationProcessor[msgType]; ok { return val } - var obj allocationProcessorFactory - switch msgType { - //图片渲染 - case constants.WEBSOCKET_RENDER_IMAGE: - obj = &renderProcessor{} - default: - return nil - } - mapAllocationProcessor[msgType] = obj - return obj + return nil } From aa4acd1bd2cc963ba01e2f3eaf4c5f699b1a0234 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 30 Oct 2023 18:26:52 +0800 Subject: [PATCH 3/3] fix --- .../internal/logic/ws_allocation_processing_factory.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/websocket/internal/logic/ws_allocation_processing_factory.go b/server/websocket/internal/logic/ws_allocation_processing_factory.go index 7fedddc1..2e888040 100644 --- a/server/websocket/internal/logic/ws_allocation_processing_factory.go +++ b/server/websocket/internal/logic/ws_allocation_processing_factory.go @@ -16,8 +16,5 @@ var mapAllocationProcessor = map[constants.Websocket]allocationProcessorFactory{ } func (w *wsConnectItem) newAllocationProcessor(msgType constants.Websocket) allocationProcessorFactory { - if val, ok := mapAllocationProcessor[msgType]; ok { - return val - } - return nil + return mapAllocationProcessor[msgType] }