From 99ca3eba90c316507ec204a97d7c49616fee5295 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 11 Jun 2022 22:54:12 +0800 Subject: [PATCH 1/5] :memo: Update FAQ --- .../20200923234731-h3zkwm2.sy | 184 +++-------------- .../20200813093015-u6bopdt.sy | 185 +++--------------- .../20211226115227-r1rty9v.sy | 182 +++-------------- 3 files changed, 87 insertions(+), 464 deletions(-) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy index 82597593a..59f4056c4 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy @@ -6,7 +6,7 @@ "id": "20200923234731-h3zkwm2", "title": "Frequently Asked Questions", "type": "doc", - "updated": "20220526112843" + "updated": "20220611225313" }, "Children": [ { @@ -922,7 +922,7 @@ }, { "Type": "NodeLinkDest", - "Data": "https://github.com/siyuan-note/siyuan/blob/master/DEV.md" + "Data": "https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING.md" }, { "Type": "NodeCloseParen" @@ -1148,39 +1148,51 @@ ] }, { - "ID": "20210605222653-et0mf32", + "ID": "20220611225313-5g3k4q9", "Type": "NodeHeading", "HeadingLevel": 2, "Properties": { - "id": "20210605222653-et0mf32", - "updated": "20210605222653" + "id": "20220611225313-5g3k4q9", + "updated": "20220611225313" }, "Children": [ { "Type": "NodeText", - "Data": "How to adjust table rows and columns?" + "Data": "How to do find and replace?" } ] }, { - "ID": "20210605222653-1wzvefr", + "ID": "20220611225313-frtsm0p", "Type": "NodeParagraph", "Properties": { - "id": "20210605222653-1wzvefr", - "updated": "20220421192837" + "id": "20220611225313-frtsm0p", + "updated": "20220611225313" }, "Children": [ { "Type": "NodeText", - "Data": "T" + "Data": "Press " + }, + { + "Type": "NodeKbd", + "Data": "kbd", + "Children": [ + { + "Type": "NodeKbdOpenMarker" + }, + { + "Type": "NodeText", + "Data": "Ctrl+R" + }, + { + "Type": "NodeKbdCloseMarker" + } + ] }, { "Type": "NodeText", - "Data": "here" - }, - { - "Type": "NodeText", - "Data": " is an operation entry in the block icon menu of the table block." + "Data": " after selecting the keyword in the editor." } ] }, @@ -1233,148 +1245,6 @@ } ] }, - { - "ID": "20220421192456-82tb0zz", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220421192456-82tb0zz", - "updated": "20220421192456" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "How to search for content containing symbols?" - } - ] - }, - { - "ID": "20220421192456-kg2nv1z", - "Type": "NodeParagraph", - "Properties": { - "id": "20220421192456-kg2nv1z", - "updated": "20220421192531" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "If you need to search for content containing symbols (" - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "-" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": ", " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "*" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": ", etc.), you need to use " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "\"" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " to wrap keywords, such as " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "\"-siyuan\"" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": ". For details, please refer to " - }, - { - "Type": "NodeBlockRef", - "Data": "span", - "Children": [ - { - "Type": "NodeOpenParen" - }, - { - "Type": "NodeOpenParen" - }, - { - "Type": "NodeBlockRefID", - "Data": "20220415232231-pqcizol" - }, - { - "Type": "NodeBlockRefSpace" - }, - { - "Type": "NodeBlockRefText", - "Data": "Query syntax" - }, - { - "Type": "NodeCloseParen" - }, - { - "Type": "NodeCloseParen" - } - ] - }, - { - "Type": "NodeText", - "Data": "." - } - ] - }, { "ID": "20210918115655-8l0v4yh", "Type": "NodeHeading", diff --git a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy index 1f38538db..fb897164f 100644 --- a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy +++ b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy @@ -6,7 +6,7 @@ "id": "20200813093015-u6bopdt", "title": "常见问题", "type": "doc", - "updated": "20220526112824" + "updated": "20220611225257" }, "Children": [ { @@ -922,7 +922,7 @@ }, { "Type": "NodeLinkDest", - "Data": "https://github.com/siyuan-note/siyuan/blob/master/DEV_zh_CN.md" + "Data": "https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING_zh_CN.md" }, { "Type": "NodeCloseParen" @@ -1148,34 +1148,51 @@ ] }, { - "ID": "20201224120447-j29fd5f", + "ID": "20220611225209-n74y51b", "Type": "NodeHeading", "HeadingLevel": 2, "Properties": { - "id": "20201224120447-j29fd5f" + "id": "20220611225209-n74y51b", + "updated": "20220611225218" }, "Children": [ - { - "Type": "NodeHeadingC8hMarker", - "Data": "## " - }, { "Type": "NodeText", - "Data": "如何调整表格行列？" + "Data": "如何进行查找替换？" } ] }, { - "ID": "20210512152759-k9i5m4t", + "ID": "20220611225219-h4hz16v", "Type": "NodeParagraph", "Properties": { - "id": "20210512152759-k9i5m4t", - "updated": "20210605222411" + "id": "20220611225219-h4hz16v", + "updated": "20220611225257" }, "Children": [ { "Type": "NodeText", - "Data": "表格块的块标菜单中有操作入口。" + "Data": "编辑器中选择关键字后按下 " + }, + { + "Type": "NodeKbd", + "Data": "kbd", + "Children": [ + { + "Type": "NodeKbdOpenMarker" + }, + { + "Type": "NodeText", + "Data": "Ctrl+R" + }, + { + "Type": "NodeKbdCloseMarker" + } + ] + }, + { + "Type": "NodeText", + "Data": "。" } ] }, @@ -1228,148 +1245,6 @@ } ] }, - { - "ID": "20220421192119-8yqvcpc", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220421192119-8yqvcpc", - "updated": "20220421192442" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "如何搜索包含符号的内容？" - } - ] - }, - { - "ID": "20220421192133-zpcg7vt", - "Type": "NodeParagraph", - "Properties": { - "id": "20220421192133-zpcg7vt", - "updated": "20220421192331" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "如果需要搜索包含符号（ " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "-" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "、" - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "*" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 等）的内容，需要使用 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "\"" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 包裹关键字，比如 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "\"-siyuan\"" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "。具体细节请参考" - }, - { - "Type": "NodeBlockRef", - "Data": "span", - "Children": [ - { - "Type": "NodeOpenParen" - }, - { - "Type": "NodeOpenParen" - }, - { - "Type": "NodeBlockRefID", - "Data": "20220415190432-r3xqn3r" - }, - { - "Type": "NodeBlockRefSpace" - }, - { - "Type": "NodeBlockRefText", - "Data": "查询语法" - }, - { - "Type": "NodeCloseParen" - }, - { - "Type": "NodeCloseParen" - } - ] - }, - { - "Type": "NodeText", - "Data": "。" - } - ] - }, { "ID": "20210918114843-6xo7hmr", "Type": "NodeHeading", diff --git a/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy b/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy index f6c2aca73..eef95c683 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy @@ -5,7 +5,7 @@ "icon": "2753", "id": "20211226115227-r1rty9v", "title": "常見問題", - "updated": "20220526112913" + "updated": "20220611225324" }, "Children": [ { @@ -918,7 +918,7 @@ }, { "Type": "NodeLinkDest", - "Data": "https://github.com/siyuan-note/siyuan/blob/master/DEV_zh_CN.md" + "Data": "https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING_zh_CN.md" }, { "Type": "NodeCloseParen" @@ -1141,31 +1141,51 @@ ] }, { - "ID": "20211226115356-f9knemj", + "ID": "20220611225324-5aq5cr9", "Type": "NodeHeading", "HeadingLevel": 2, "Properties": { - "id": "20211226115356-f9knemj", - "updated": "20211225214824" + "id": "20220611225324-5aq5cr9", + "updated": "20220611225324" }, "Children": [ { "Type": "NodeText", - "Data": "如何調整表格行列？" + "Data": "如何進行查找替換？" } ] }, { - "ID": "20211226115356-9rj1muh", + "ID": "20220611225324-nrh7eyp", "Type": "NodeParagraph", "Properties": { - "id": "20211226115356-9rj1muh", - "updated": "20211228130709" + "id": "20220611225324-nrh7eyp", + "updated": "20220611225324" }, "Children": [ { "Type": "NodeText", - "Data": "表格塊的塊標菜單中有作業入口。" + "Data": "編輯器中選擇關鍵字後按下 " + }, + { + "Type": "NodeKbd", + "Data": "kbd", + "Children": [ + { + "Type": "NodeKbdOpenMarker" + }, + { + "Type": "NodeText", + "Data": "Ctrl+R" + }, + { + "Type": "NodeKbdCloseMarker" + } + ] + }, + { + "Type": "NodeText", + "Data": "。" } ] }, @@ -1218,148 +1238,6 @@ } ] }, - { - "ID": "20220421192606-o093rti", - "Type": "NodeHeading", - "HeadingLevel": 2, - "Properties": { - "id": "20220421192606-o093rti", - "updated": "20220421192606" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "如何搜索包含符號的內容？" - } - ] - }, - { - "ID": "20220421192606-fmhxfvg", - "Type": "NodeParagraph", - "Properties": { - "id": "20220421192606-fmhxfvg", - "updated": "20220421192629" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "如果需要搜索包含符號（ " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "-" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "、" - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "*" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 等）的內容，需要使用 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "\"" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": " 包裹關鍵字，比如 " - }, - { - "Type": "NodeCodeSpan", - "Data": "code", - "Children": [ - { - "Type": "NodeCodeSpanOpenMarker" - }, - { - "Type": "NodeCodeSpanContent", - "Data": "\"-siyuan\"" - }, - { - "Type": "NodeCodeSpanCloseMarker" - } - ] - }, - { - "Type": "NodeText", - "Data": "。具體細節請參考" - }, - { - "Type": "NodeBlockRef", - "Data": "span", - "Children": [ - { - "Type": "NodeOpenParen" - }, - { - "Type": "NodeOpenParen" - }, - { - "Type": "NodeBlockRefID", - "Data": "20220415232129-shpzg6r" - }, - { - "Type": "NodeBlockRefSpace" - }, - { - "Type": "NodeBlockRefText", - "Data": "查詢語法" - }, - { - "Type": "NodeCloseParen" - }, - { - "Type": "NodeCloseParen" - } - ] - }, - { - "Type": "NodeText", - "Data": "。" - } - ] - }, { "ID": "20211226115356-ha8z0ho", "Type": "NodeHeading", From c2f4d2509556ec22cfc9c4dd2b5e3240d436a2e2 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 11 Jun 2022 22:57:15 +0800 Subject: [PATCH 2/5] :memo: Update FAQ --- README.md | 6 +++--- README_zh_CN.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ee43a1068..c29e8aa06 100644 --- a/README.md +++ b/README.md @@ -194,9 +194,9 @@ Fold the heading and move it later. Click at the beginning, hold down Shift and click at the end after scrolling the page. -### How to adjust table rows and columns? +## How to do find and replace? -There is an operation entry in the block icon menu of the table block. +Press Ctrl+R after selecting the keyword in the editor. ### How to use a third-party sync disk for data synchronization? @@ -215,7 +215,7 @@ If it is a mobile-end, uninstall and reinstall it (note: When the mobile-endunin ### Do I need to pay for it? -Local functions are completely free to use, [Cloud services](https://b3log.org/siyuan/pricing.html) requires annual subscription, price is $72/year。 +Local functions are completely free to use, [Cloud services](https://b3log.org/siyuan/en/pricing.html) requires annual subscription, price is $72/year。 Users in non-Mainland China regions should not pay for subscriptions, because SiYuan Cloud Server cannot guarantee availability in non-Mainland China regions. diff --git a/README_zh_CN.md b/README_zh_CN.md index 09adb0d46..22396a7ba 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -202,9 +202,9 @@ 在开始的地方单击，滚动页面以后在结束的地方按住 Shift 单击。 -### 如何调整表格行列？ +## 如何进行查找替换？ -表格块的块标菜单中有操作入口。 +编辑器中选择关键字后按下 Ctrl+R。 ### 如何使用第三方同步盘进行数据同步？ From 973837c64988b930d18562926e9d6d1e65bdaf4e Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 11 Jun 2022 22:57:47 +0800 Subject: [PATCH 3/5] :memo: Update FAQ --- README.md | 2 +- README_zh_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c29e8aa06..04e32657b 100644 --- a/README.md +++ b/README.md @@ -233,7 +233,7 @@ SiYuan is completely open source, and contributions are welcome: * [Android](https://github.com/siyuan-note/siyuan-android) * [iOS](https://github.com/siyuan-note/siyuan-ios) -For more details, please refer to [Development Guide](.github/CONTRIBUTING.md). +For more details, please refer to [Development Guide](https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING.md). ## 🙏 Acknowledgement diff --git a/README_zh_CN.md b/README_zh_CN.md index 22396a7ba..17d066180 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -184,7 +184,7 @@ * [Android 端](https://github.com/siyuan-note/siyuan-android) * [iOS 端](https://github.com/siyuan-note/siyuan-ios) -更多细节请参考[开发指南](.github/CONTRIBUTING_zh_CN.md)。 +更多细节请参考[开发指南](https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING_zh_CN.md)。 ### 删除文档有什么注意事项吗？ From 71e05efb22d010e62ce8815a105a278d7e313a70 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 11 Jun 2022 23:40:29 +0800 Subject: [PATCH 4/5] :memo: Update community channels --- README.md | 6 ++++-- README_zh_CN.md | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 04e32657b..05dfc0fe0 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,9 @@ To get the latest Insider Preview, please send an email with your GitHub login n ## 🏘️ Community -* [Issues](https://github.com/siyuan-note/siyuan/issues) +* [Issues](https://github.com/siyuan-note/siyuan/issues) Official support channels +* [Discord](https://discord.com/invite/bzfCBwMzdP) A community built by enthusiastic users +* [Awesome SiYuan](https://github.com/siyuan-note/awesome) Resources organized by enthusiastic users ## ❓ FAQ @@ -176,7 +178,7 @@ SiYuan is completely open source, and contributions are welcome: * [Android](https://github.com/siyuan-note/siyuan-android) * [iOS](https://github.com/siyuan-note/siyuan-ios) -For more details, please refer to [Development Guide](.github/CONTRIBUTING.md). +For more details, please refer to [Development Guide](https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING.md). ### Is there any note for deleting docs? diff --git a/README_zh_CN.md b/README_zh_CN.md index 17d066180..365d034d0 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -154,9 +154,9 @@ ## 🏘️ 社区 -* [中文讨论区](https://ld246.com/domain/siyuan) -* [GitHub Issues](https://github.com/siyuan-note/siyuan/issues) -* [用户社群汇总](https://ld246.com/article/1640266171309) +* [中文讨论区](https://ld246.com/domain/siyuan) 官方支持渠道 +* [用户社区汇总](https://ld246.com/article/1640266171309) 由热心用户建立的社区 +* [Awesome SiYuan](https://github.com/siyuan-note/awesome) 由热心用户整理的资源 ## ❓ 常见问题和解答 @@ -241,7 +241,7 @@ * [Android 端](https://github.com/siyuan-note/siyuan-android) * [iOS 端](https://github.com/siyuan-note/siyuan-ios) -更多细节请参考[开发指南](.github/CONTRIBUTING_zh_CN.md)。 +更多细节请参考[开发指南](https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING_zh_CN.md)。 ## 🙏 鸣谢 From 820a8bf4c02c8b6688458c71dd2dc489553c1720 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 11 Jun 2022 23:40:43 +0800 Subject: [PATCH 5/5] :arrow_up: Upgrade deps --- kernel/go.mod | 10 +++++----- kernel/go.sum | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 0722fa086..1e180f68f 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -30,7 +30,7 @@ require ( github.com/gin-contrib/gzip v0.0.5 github.com/gin-contrib/sessions v0.0.5 github.com/gin-gonic/gin v1.8.1 - github.com/imroc/req/v3 v3.12.0 + github.com/imroc/req/v3 v3.13.1 github.com/jinzhu/copier v0.3.5 github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/mattn/go-zglob v0.0.3 @@ -38,9 +38,9 @@ require ( github.com/mssola/user_agent v0.5.3 github.com/panjf2000/ants/v2 v2.5.0 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/qiniu/go-sdk/v7 v7.12.1 + github.com/qiniu/go-sdk/v7 v7.13.0 github.com/radovskyb/watcher v1.0.7 - github.com/siyuan-note/encryption v0.0.0-20210811062758-4d08f2d31e37 + github.com/siyuan-note/encryption v0.0.0-20220609141541-7ba697278320 github.com/vmihailenco/msgpack/v5 v5.3.5 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 golang.org/x/image v0.0.0-20220601225756-64ec528b34cd @@ -84,7 +84,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.0.1 // indirect + github.com/pelletier/go-toml/v2 v2.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/spf13/cast v1.5.0 // indirect @@ -94,7 +94,7 @@ require ( golang.org/x/mod v0.5.1 // indirect golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect golang.org/x/tools v0.1.8 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.28.0 // indirect diff --git a/kernel/go.sum b/kernel/go.sum index 2a432cccf..6ab841abf 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -299,6 +299,8 @@ github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/imroc/req/v3 v3.12.0 h1:uYva3QKn/fCFXCQJSgRdbycOye517NqqYcADfWGtRq8= github.com/imroc/req/v3 v3.12.0/go.mod h1:G6fkq27P+JcTcgRVxecxY+amHN1xFl8W81eLCfJ151M= +github.com/imroc/req/v3 v3.13.1 h1:kgqEyBkuZQ4Fbv5M2sC0v6Sov9Ne4JurYmziRphvpHU= +github.com/imroc/req/v3 v3.13.1/go.mod h1:G6fkq27P+JcTcgRVxecxY+amHN1xFl8W81eLCfJ151M= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= @@ -379,6 +381,8 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= +github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= +github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -392,6 +396,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdkk= github.com/qiniu/go-sdk/v7 v7.12.1 h1:FZG5dhs2MZBV/mHVhmHnsgsQ+j1gSE0RqIoA2WwEDwY= github.com/qiniu/go-sdk/v7 v7.12.1/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFsDY0BLE+w= +github.com/qiniu/go-sdk/v7 v7.13.0 h1:0bWRh/oAC2cArUILZLuWN+s9hPep1JYch5sA2Mfxq7A= +github.com/qiniu/go-sdk/v7 v7.13.0/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFsDY0BLE+w= github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs= github.com/radovskyb/watcher v1.0.7 h1:AYePLih6dpmS32vlHfhCeli8127LzkIgwJGcwwe8tUE= github.com/radovskyb/watcher v1.0.7/go.mod h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg= @@ -417,6 +423,8 @@ github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJV github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/siyuan-note/encryption v0.0.0-20210811062758-4d08f2d31e37 h1:WvJU9uRS7kaaqnNShIMMtR2Yf8duGmXYJXYGg69EXBs= github.com/siyuan-note/encryption v0.0.0-20210811062758-4d08f2d31e37/go.mod h1:hWBdT3FZEzWvIbZpXYJvkSBH2+Z4GvYcOpKpXcZC+zg= +github.com/siyuan-note/encryption v0.0.0-20220609141541-7ba697278320 h1:CQKC+OpTjzFJjZK9/NY3OYg/gSYmMQM9RsBk5Mznimg= +github.com/siyuan-note/encryption v0.0.0-20220609141541-7ba697278320/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= @@ -436,8 +444,11 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= @@ -645,6 +656,8 @@ golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d h1:Zu/JngovGLVi6t2J3nmAf3AoTDwuzw85YZ3b9o4yU7s= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20180302201248-b7ef84aaf62a/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -844,6 +857,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=