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

server/websocket/internal/logic/ws_render_image.go

@@ -42,7 +42,7 @@ type extendRenderProperty struct {
 
 // 处理分发到这里的数据
 func (r *renderProcessor) allocationMessage(w *wsConnectItem, data []byte) {
-	logx.Info("收到渲染任务消息")
+	//logx.Info("收到渲染任务消息")
 	var renderImageData websocket_data.RenderImageReqMsg
 	if err := json.Unmarshal(data, &renderImageData); err != nil {
 		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "数据格式错误", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
@@ -136,6 +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
 	}
+	//没传分辨率
+	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 {
+		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "请传入正确的合图分辨率范围值(512~2048)", 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)
@@ -200,6 +215,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
 			Color: renderImageData.RenderData.TemplateTagColor.Colors,
 			Index: renderImageData.RenderData.TemplateTagColor.SelectedColorIndex,
 		},
+		Resolution: renderImageData.RenderData.Resolution,
 	}
 	res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
 	if err != nil {

utils/websocket_data/render_data.go

@@ -17,6 +17,7 @@ type RenderData struct {
 	TemplateTag       string           `json:"template_tag"`        //模板标签(必须)
 	TemplateTagColor  TemplateTagColor `json:"template_tag_color"`  //模板标签组合颜色(必须)
 	TemplateTagGroups interface{}      `json:"template_tag_groups"` //模板标签分组信息数组(必须)
+	Resolution        string           `json:"resolution"`          //合图分辨率
 	Logo              string           `json:"logo"`                //log资源地址(必须)
 	ProductId         int64            `json:"product_id"`          //产品id(必须)
 	Website           string           `json:"website"`             //网站(可选)