Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 15:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-10-30 00:06:36 +08:00
commit f33512ed8c
7 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/CONTRIBUTING.md vendored
View file

@ -32,6 +32,8 @@ On the desktop, go to the app folder to run:
* `pnpm run dev`
* `pnpm run start`
Note: In the development environment, the kernel process will not be automatically started, and you need to manually start the kernel process first.
## Kernel
### Desktop

2
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -31,6 +31,8 @@ NPM 镜像：
* `pnpm run dev`
* `pnpm run start`
注意：在开发环境下不会自动拉起内核进程，需要先手动拉起内核进程。
## 内核
### 桌面端

2
kernel/go.mod
View file

@ -6,7 +6,7 @@ require (
github.com/88250/clipboard v0.1.5
github.com/88250/css v0.1.2
github.com/88250/gulu v1.2.3-0.20221021091528-70e533d91a88
github.com/88250/lute v1.7.5-0.20221029140104-a3b608bdb658
github.com/88250/lute v1.7.5-0.20221029143836-e25e72d2a557
github.com/88250/pdfcpu v0.3.13
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732

12
kernel/go.sum
View file

@ -17,14 +17,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS
github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20221021091528-70e533d91a88 h1:Ax1/qJEF0Ipc2FtgHJEXy3EExpPsT3VKlGEbWlJFBwQ=
github.com/88250/gulu v1.2.3-0.20221021091528-70e533d91a88/go.mod h1:I1qBzsksFL2ciGSuqDE7R3XW4BUMrfDgOvSXEk7FsAI=
github.com/88250/lute v1.7.5-0.20221022153730-92ba7f9ffcb9 h1:ATtPDhZ7/DbbdU+DyKTMiCSBdk00MYD/46i/eAUbE/8=
github.com/88250/lute v1.7.5-0.20221022153730-92ba7f9ffcb9/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20221025110546-319a4ded6c94 h1:mi9O3bjQjUKmsFS79l6eviXwrBXQKVowp5j/Dg5AOqc=
github.com/88250/lute v1.7.5-0.20221025110546-319a4ded6c94/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20221027150010-0f7df877941b h1:tlgbBAtUCQ2jl3Cu+TFVbdndBXdScpRj7PIOXGHMo/Q=
github.com/88250/lute v1.7.5-0.20221027150010-0f7df877941b/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20221029140104-a3b608bdb658 h1:WlnLSxxLG4lROkwtwfC3RoYfan9kbrjnVv4ylYIQT2w=
github.com/88250/lute v1.7.5-0.20221029140104-a3b608bdb658/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20221029143836-e25e72d2a557 h1:0swESsHjzPXzDSFcD2q2dVefn3yaSF5hV6zfkF0u0Go=
github.com/88250/lute v1.7.5-0.20221029143836-e25e72d2a557/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=
github.com/88250/pdfcpu v0.3.13/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=
@ -358,8 +352,6 @@ github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1l
github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
github.com/siyuan-note/dejavu v0.0.0-20221023014147-5c1359ab1fb4 h1:W9Kg+Slsm1yOwcoLTeXP85mEqCb4jW/dL7YiQg26OKc=
github.com/siyuan-note/dejavu v0.0.0-20221023014147-5c1359ab1fb4/go.mod h1:i245FL1nmWaLlor+79tGDWZrAPeDvFOkHPJbZ844PyM=
github.com/siyuan-note/dejavu v0.0.0-20221023024107-17bf52da95a1 h1:sk6pyVp22MfFXK8C5YOKD5eqWtvcMnkiEh1nyZlw4aU=
github.com/siyuan-note/dejavu v0.0.0-20221023024107-17bf52da95a1/go.mod h1:f+6y7KcTLlk2N2dLl5HeV/YzkyCTEqWNoMiWT0gkMi8=
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE=

6
kernel/model/blockial.go
View file

@ -179,6 +179,12 @@ func ResetBlockAttrs(id string, nameValues map[string]string) (err error) {
}
}
if ast.NodeDocument == node.Type {
// 修改命名文档块后引用动态锚文本未跟随 https://github.com/siyuan-note/siyuan/issues/6398
// 使用重命名文档队列来刷新引用锚文本
updateRefTextRenameDoc(tree)
}
if err = indexWriteJSONQueue(tree); nil != err {
return
}

2
kernel/model/file.go
View file

@ -1235,7 +1235,7 @@ func RenameDoc(boxID, p, title string) (err error) {
util.PushEvent(evt)
box.renameSubTrees(tree)
go updateRefTextRenameDoc(tree)
updateRefTextRenameDoc(tree)
IncSync()
return
}

6
kernel/model/session.go
View file

@ -171,8 +171,10 @@ func CheckAuth(c *gin.Context) {
}
// 放过来自本机的某些请求
if strings.HasPrefix(c.Request.RemoteAddr, util.LocalHost) || strings.HasPrefix(c.Request.RemoteAddr, "127.0.0.1") {
if strings.HasPrefix(c.Request.RequestURI, "/assets/") || strings.HasPrefix(c.Request.RequestURI, "/history/assets/") {
if strings.HasPrefix(c.Request.RemoteAddr, util.LocalHost) ||
strings.HasPrefix(c.Request.RemoteAddr, "127.0.0.1") ||
strings.HasPrefix(c.Request.RemoteAddr, "[::1]") {
if strings.HasPrefix(c.Request.RequestURI, "/assets/") {
c.Next()
return
}