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

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
 	}
 	//没传分辨率

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, "/")