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

server/product/internal/logic/gettemplatebypidlogic.go

@@ -118,18 +118,18 @@ func (l *GetTemplateByPidLogic) GetTemplateByPid(req *types.GetTemplateByPidReq,
 			"material_data": map[string]interface{}{
 				"QRcode": map[string]interface{}{
 					"if_show":       true,
-					"text":          "二维码",
-					"default_value": "默认二维码",
+					"text":          "1111",
+					"default_value": "11111",
 				},
 				"Website": map[string]interface{}{
 					"if_show":       true,
-					"text":          "网站",
-					"default_value": "默认网站",
+					"text":          "2222",
+					"default_value": "2222",
 				},
 				"Address": map[string]interface{}{
 					"if_show":       true,
 					"text":          "address",
-					"default_value": "非洲",
+					"default_value": "address",
 				},
 				"Phone": map[string]interface{}{
 					"if_show":       true,

server/websocket/internal/logic/ws_render_image_logic.go

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