From 9dd6ac48deffac5228f6f8a36da590f2b51eecd9 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 29 Oct 2022 10:23:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:bug:=20=E5=BC=95=E7=94=A8=E9=9D=9E?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=91=BD=E5=90=8D=E5=9D=97=E6=97=B6=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E9=94=9A=E6=96=87=E6=9C=AC=E6=B2=A1=E6=9C=89=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=91=BD=E5=90=8D=20Fix=20https://github.com/siyuan-n?= =?UTF-8?q?ote/siyuan/issues/6397?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/transaction.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index 3803004d4..657f6a6fc 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -1170,9 +1170,6 @@ func updateRefText(refNode *ast.Node, changedDefNodes map[string]*ast.Node) (cha if nil == defNode { return ast.WalkSkipChildren } - if ast.NodeDocument != defNode.Type && defNode.IsContainerBlock() { - defNode = treenode.FirstLeafBlock(defNode) - } refText := getNodeRefText(defNode) treenode.SetDynamicBlockRefText(n, refText) From 20ab9dd5a987a911f086c40c46d862a91b002195 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 29 Oct 2022 21:47:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E5=88=87=E6=8D=A2=E5=9B=9E?= =?UTF-8?q?=E9=80=9A=E8=BF=87=20IP=20`127.0.0.1`=20=E5=8A=A0=E8=BD=BD=20ht?= =?UTF-8?q?tps://github.com/siyuan-note/siyuan/issues/6381?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/boot/index.html | 4 ++-- app/electron/main.js | 2 +- .../20210808180303-xaduj2o/20201004194026-s8h2cog.sy | 2 +- .../20210808180321-hbvl5c2/20201004184819-nj8ibyg.sy | 2 +- .../20211226121203-rjjngpz/20211226122523-rl8356a.sy | 2 +- app/src/config/about.ts | 2 +- app/src/mobile/util/menu.ts | 4 ++-- kernel/util/working.go | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/appearance/boot/index.html b/app/appearance/boot/index.html index 7edfb8d1c..75569556d 100644 --- a/app/appearance/boot/index.html +++ b/app/appearance/boot/index.html @@ -100,7 +100,7 @@ return new Promise(resolve => setTimeout(resolve, ms)) } const redirect = () => { - const uri = 'http://localhost:' + location.port + const uri = 'http://127.0.0.1:' + location.port if (navigator.userAgent.match(/Android/i)) document.location = uri else @@ -113,7 +113,7 @@ let progressing = false while (!progressing) { try { - const progressResult = await fetch('http://localhost:' + location.port + '/api/system/bootProgress') + const progressResult = await fetch('http://127.0.0.1:' + location.port + '/api/system/bootProgress') const progressData = await progressResult.json() document.getElementById('progress').style.width = progressData.data.progress + '%' document.getElementById('details').textContent = progressData.data.details diff --git a/app/electron/main.js b/app/electron/main.js index 0930c6602..52de8bbe7 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -43,7 +43,7 @@ let siyuanOpenURL let firstOpen = false let resetWindowStateOnRestart = false let kernelPort = "6806" -const localhost = "localhost" +const localhost = "127.0.0.1" require('@electron/remote/main').initialize() if (!app.requestSingleInstanceLock()) { diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20201004194026-s8h2cog.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20201004194026-s8h2cog.sy index 84b764314..a886023d3 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20201004194026-s8h2cog.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20201004194026-s8h2cog.sy @@ -75,7 +75,7 @@ { "Type": "NodeTextMark", "TextMarkType": "code", - "TextMarkTextContent": "localhost" + "TextMarkTextContent": "127.0.0.1" }, { "Type": "NodeText", diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20201004184819-nj8ibyg.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20201004184819-nj8ibyg.sy index 11af643f1..ed872cd16 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20201004184819-nj8ibyg.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20201004184819-nj8ibyg.sy @@ -76,7 +76,7 @@ { "Type": "NodeTextMark", "TextMarkType": "code", - "TextMarkTextContent": "localhost" + "TextMarkTextContent": "127.0.0.1" }, { "Type": "NodeText", diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122523-rl8356a.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122523-rl8356a.sy index d79581c38..a176270b6 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122523-rl8356a.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122523-rl8356a.sy @@ -75,7 +75,7 @@ { "Type": "NodeTextMark", "TextMarkType": "code", - "TextMarkTextContent": "localhost" + "TextMarkTextContent": "127.0.0.1" }, { "Type": "NodeText", diff --git a/app/src/config/about.ts b/app/src/config/about.ts index 3e37c016f..b7adb7a9e 100644 --- a/app/src/config/about.ts +++ b/app/src/config/about.ts @@ -55,7 +55,7 @@ export const about = { ${window.siyuan.config.localIPs.join(" ")}
- diff --git a/app/src/mobile/util/menu.ts b/app/src/mobile/util/menu.ts index 02632bd7c..6ff4c525e 100644 --- a/app/src/mobile/util/menu.ts +++ b/app/src/mobile/util/menu.ts @@ -177,7 +177,7 @@ ${accountHTML} closePanel(); if (!window.siyuan.config.localIPs || window.siyuan.config.localIPs.length === 0 || (window.siyuan.config.localIPs.length === 1 && window.siyuan.config.localIPs[0] === "")) { - window.siyuan.config.localIPs = ["localhost"]; + window.siyuan.config.localIPs = ["127.0.0.1"]; } modelElement.style.top = "0"; modelElement.querySelector(".toolbar__icon").innerHTML = ''; @@ -193,7 +193,7 @@ ${accountHTML}
${window.siyuan.languages.about2}
- +
${window.siyuan.languages.about3.replace("${port}", location.port)}
${window.siyuan.config.localIPs.join(" ")} diff --git a/kernel/util/working.go b/kernel/util/working.go index 5bcc2167e..868795f6a 100644 --- a/kernel/util/working.go +++ b/kernel/util/working.go @@ -290,7 +290,7 @@ const ( ContainerAndroid = "android" // Android 端 ContainerIOS = "ios" // iOS 端 - LocalHost = "localhost" // 本地域名，由操作系统自动解析到 127.0.0.1 + LocalHost = "127.0.0.1" // 伺服地址 FixedPort = "6806" // 固定端口 )