From 885aa081c6529b04d3834e2d3270683a747a545a Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Sun, 8 Oct 2023 16:07:55 +0800
Subject: [PATCH] fix

---
 .../websocket/internal/logic/ws_render_image.go  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go
index 056cfacc..95532d4f 100644
--- a/server/websocket/internal/logic/ws_render_image.go
+++ b/server/websocket/internal/logic/ws_render_image.go
@@ -136,11 +136,21 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
 		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "非法的logo", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
 		return
 	}
-	renderImageData.RenderData.Resolution = "512"
-	/*if renderImageData.RenderData.Resolution == "" {
+	//没传分辨率
+	if renderImageData.RenderData.Resolution == "" {
 		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "请传入合图分辨率", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
 		return
-	}*/
+	}
+	//分辨率校验
+	resolution, err := strconv.Atoi(renderImageData.RenderData.Resolution)
+	if err != nil {
+		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "请传入正确的合图分辨率格式", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
+		return
+	}
+	if resolution < 512 || resolution > 2048 || resolution%512 != 0 {
+		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "请传入正确的合图分辨率范围值(512~2048),且是512倍数", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
+		return
+	}
 	lenColor := len(renderImageData.RenderData.TemplateTagColor.Colors)
 	if lenColor == 0 {
 		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "请传入模板标签选择的颜色", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)