From 361a8eb5807816c2eff2045e20f4d2c75d237deb Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Tue, 31 Oct 2023 12:20:42 +0800
Subject: [PATCH 1/2] fix

---
 utils/s3url_to_s3id/s3url_to_s3id.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/s3url_to_s3id/s3url_to_s3id.go b/utils/s3url_to_s3id/s3url_to_s3id.go
index 8183e888..ec0e57d0 100644
--- a/utils/s3url_to_s3id/s3url_to_s3id.go
+++ b/utils/s3url_to_s3id/s3url_to_s3id.go
@@ -4,7 +4,7 @@ import "strings"
 
 // 通过url解析资源id
 func GetS3ResourceIdFormUrl(s3Url string) string {
-	if !strings.Contains(s3Url, "fusen") {
+	if !strings.Contains(s3Url, "https://") {
 		return ""
 	}
 	s := strings.Split(s3Url, "/")

From 12b0be2f6d4fa1033de0aefbd3c5444092ba7378 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Tue, 31 Oct 2023 12:22:04 +0800
Subject: [PATCH 2/2] fix

---
 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 24818210..f1fa2164 100644
--- a/server/websocket/internal/logic/ws_render_image.go
+++ b/server/websocket/internal/logic/ws_render_image.go
@@ -144,8 +144,8 @@ func (w *wsConnectItem) consumeRenderImageData() {
 
 // 执行渲染任务
 func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageReqMsg) {
-	if !strings.Contains(renderImageData.RenderData.Logo, "fusen") {
-		w.renderErrResponse(renderImageData.RequestId, renderImageData.RenderData.TemplateTag, "", "非法的logo", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
+	if renderImageData.RenderData.Logo == "" {
+		w.renderErrResponse(renderImageData.RequestId, renderImageData.RenderData.TemplateTag, "", "请传入logo", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
 		return
 	}
 	//没传分辨率