Skip to content
This repository was archived by the owner on Sep 17, 2023. It is now read-only.

Commit fb4547d

Browse files
committed
更新测试文档
1 parent a048b44 commit fb4547d

File tree

8 files changed

+20
-336
lines changed

8 files changed

+20
-336
lines changed

.vscode/launch.json

+10-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,18 @@
3333
// // "-IsDev=true",
3434
// ],
3535
// 项目内测试文档
36+
// "args": [
37+
// "-SourceDir=../test-doc/data/20210816210735-scu9ti5",
38+
// "-OutDir=../outHTML",
39+
// "-TemplateDir=../src/views/",
40+
// "-SqlitePath=../test-doc/temp/siyuan.db",
41+
// ]
42+
// 远程开发机测试测试
3643
"args": [
37-
"-SourceDir=../test-doc/data/20210816210735-scu9ti5",
38-
"-OutDir=../outHTML",
44+
"-SourceDir=/root/doc/SiYuan/data/20210816161940-zo21go1",
45+
"-OutDir=/root/doc/NoteOutHTML",
3946
"-TemplateDir=../src/views/",
40-
"-SqlitePath=../test-doc/temp/siyuan.db",
47+
"-SqlitePath=/root/doc/SiYuan/temp/siyuan.db",
4148
]
4249
// 旧版思源执行参数
4350
// "args": [

src/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ func HandlingAssets(node *ast.Node, outDir string, fileEntity structAll.FileEnti
228228

229229
for {
230230
assetsPath := path.Join(filepath.ToSlash(filepath.Dir(fileEntity.Path)), strings.Repeat("../", level), dest)
231-
matched, _ := filepath.Match(workspaceDir+"*", assetsPath)
232-
233-
if matched {
231+
matched, _ := filepath.Rel(workspaceDir+"*", assetsPath)
232+
// 判断资源文件是否处于工作空间内,超出工作空间的不处理
233+
if len(matched) > 0 {
234234
_, err := os.Stat(assetsPath)
235235
if err == nil {
236236
matched, _ := filepath.Match(sourceDir+"*", assetsPath)

test-doc/.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88

99
oceanPressTemp.db
1010

11-
history/
11+
history/
12+
siyuan.log

test-doc/conf/conf.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@
333333
"publicKey": "c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFETjdvN0orS1U1akpZdVAyeVpMcGZDRnQwcVdwQWplN1VBK0xJeFlsVEdsQitLbEJjUVpvVWZyZlJsakw1eVFWbWpDWERTK2dXRFQ4SWlVWlZ2bjFjVXkrbGFOT2tjb1Z2dkhrTFVHYUk2bmdHZE5IUy82amhKRnNLSjhaV25hNEZyOWFLMU81aFhVTTJVU2hGeXhDZDhUdStTd2FLaU1Nb0hUT1BuUWtROEhzVUYvcGRvY3AyWm85YWd5U2RYcWtObTdXK0srM1k0UllDdk1MMFVzT1dBTHczWW5FRmk2d3dPNk9EQzk3c0EySzZoa2VmeGFWWmZwdzlFSHRibUdZK2xIQUJvUjB5TDRXb2o1ekszWVJUUmptR2R6QS9ldTFLMXNvbC9ZakVlTDl0a1F0MnNyWnhIQytxY3lTQnZyazJkSUU1Rkw2cUgyL1JmRnFJTTlRVzcK"
334334
},
335335
"readonly": false,
336-
"localServeURL": "http://127.0.0.1:6806",
337-
"accessAuthCode": "",
336+
"localServeURL": "http://dev.shenzilong.cn:7002",
337+
"accessAuthCode": "szlsiyuan",
338338
"e2eePasswd": "",
339339
"checkUpdate": 0,
340340
"system": {

test-doc/conf/siyuan.log

-325
This file was deleted.

test-doc/data/.siyuan/conf.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"updated": 1630938192568,
3-
"syncVer": 493
2+
"updated": 1630985551720,
3+
"syncVer": 504
44
}

test-doc/data/20210816210735-scu9ti5/20210807155017-xz6i9yy.sy

+1
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@
338338
"Type": "NodeWidget",
339339
"Data": "\u003ciframe src=\"http://dev.shenzilong.cn:6806/widgets/run-code\" data-src=\"http://dev.shenzilong.cn:6806/widgets/run-code\" data-subtype=\"widget\" border=\"0\" frameborder=\"no\" framespacing=\"0\" allowfullscreen=\"true\" style=\"width: 733px; height: 217px;\"\u003e\u003c/iframe\u003e",
340340
"Properties": {
341+
"custom-config": "{\u0026quot;source\u0026quot;:\u0026quot;\u0026quot;,\u0026quot;inside\u0026quot;:\u0026quot;inside\u0026quot;,\u0026quot;title\u0026quot;:\u0026quot;\u0026quot;,\u0026quot;preamble\u0026quot;:\u0026quot;\u0026quot;,\u0026quot;version\u0026quot;:\u0026quot;16.6.0\u0026quot;}",
341342
"id": "20210906222234-063ys5f",
342343
"updated": "20210906222234"
343344
}

test-doc/temp/siyuan.db

-4 KB
Binary file not shown.

0 commit comments

Comments
 (0)