diff --git a/server/websocket/internal/logic/ws_allocation_processing_factory.go b/server/websocket/internal/logic/ws_allocation_processing_factory.go index 9ba718cc..2e888040 100644 --- a/server/websocket/internal/logic/ws_allocation_processing_factory.go +++ b/server/websocket/internal/logic/ws_allocation_processing_factory.go @@ -10,20 +10,11 @@ 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 mapAllocationProcessor[msgType] } 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)