From 85aa7ac6fe0e6734598f7db79aa2f4c25cd17566 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 31 Oct 2022 21:26:11 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=20`=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E5=9B=BE=E7=89=87=E8=BD=AC=E6=8D=A2=E4=B8=BA=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=89=87`=20=E5=BE=AE=E4=BF=A1=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=8B=89=E5=8F=96=20Fix=20https://github.com/siyuan-n?= =?UTF-8?q?ote/siyuan/issues/6431?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/assets.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/kernel/model/assets.go b/kernel/model/assets.go index bab1b89e7..c8bcd1332 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -95,15 +95,18 @@ func NetImg2LocalAssets(rootID string) (err error) { if !sql.IsAssetLinkDest(dest) && (bytes.HasPrefix(bytes.ToLower(dest), []byte("https://")) || bytes.HasPrefix(bytes.ToLower(dest), []byte("http://"))) { u := string(dest) if strings.Contains(u, "qpic.cn") { - // 微信图片拉取改进 https://github.com/siyuan-note/siyuan/issues/5052 + // 改进 `网络图片转换为本地图片` 微信图片拉取 https://github.com/siyuan-note/siyuan/issues/5052 if strings.Contains(u, "http://") { u = strings.Replace(u, "http://", "https://", 1) } - if strings.HasSuffix(u, "/0") { - u = strings.Replace(u, "/0", "/640", 1) - } else if strings.Contains(u, "/0?") { - u = strings.Replace(u, "/0?", "/640?", 1) - } + + // 改进 `网络图片转换为本地图片` 微信图片拉取 https://github.com/siyuan-note/siyuan/issues/6431 + // 下面这部分需要注释掉，否则会导致响应 400 + //if strings.HasSuffix(u, "/0") { + // u = strings.Replace(u, "/0", "/640", 1) + //} else if strings.Contains(u, "/0?") { + // u = strings.Replace(u, "/0?", "/640?", 1) + //} } util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(119), u), 15000) request := httpclient.NewBrowserRequest()