内容整理优化

Author: TruthHun88

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/TruthHun/gotil v0.0.0-20191003091818-17b80aad8a45
 	github.com/TruthHun/html2article v0.0.0-20180202140721-67d6ff09647b
 	github.com/TruthHun/html2json v0.0.0-20191003085735-6ba0884c8c03
-	github.com/TruthHun/html2md v0.0.0-20191201015448-df9bb95f2766
+	github.com/TruthHun/html2md v0.0.0-20200103021813-42640c281ac8
 	github.com/adamzy/cedar-go v0.0.0-20170805034717-80a9c64b256d // indirect
 	github.com/alexcesaro/mail v0.0.0-20141015155039-29068ce49a17
 	github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible

go.sum

@@ -14,6 +14,8 @@ github.com/TruthHun/html2json v0.0.0-20191003085735-6ba0884c8c03 h1:U/7QljxB6t4M
 github.com/TruthHun/html2json v0.0.0-20191003085735-6ba0884c8c03/go.mod h1:n5PB/a6/pLUOkuhqQDmDebIesSCpeZ8nJi8/x0t+lUQ=
 github.com/TruthHun/html2md v0.0.0-20191201015448-df9bb95f2766 h1:jIiQE55lc91r85ightgKzBjYd8/PKYMCJd6sF8npgPI=
 github.com/TruthHun/html2md v0.0.0-20191201015448-df9bb95f2766/go.mod h1:krLpLGgGKK7lv2Ru8snV4DW1bPa3oPW/FVTL13E/Dws=
+github.com/TruthHun/html2md v0.0.0-20200103021813-42640c281ac8 h1:ehl5nICeqS2K/chBxq1GQNBxgrg4lAQlc4a34MoNoUM=
+github.com/TruthHun/html2md v0.0.0-20200103021813-42640c281ac8/go.mod h1:krLpLGgGKK7lv2Ru8snV4DW1bPa3oPW/FVTL13E/Dws=
 github.com/adamzy/cedar-go v0.0.0-20170805034717-80a9c64b256d h1:ir/IFJU5xbja5UaBEQLjcvn7aAU01nqU/NUyOBEU+ew=
 github.com/adamzy/cedar-go v0.0.0-20170805034717-80a9c64b256d/go.mod h1:PRWNwWq0yifz6XDPZu48aSld8BWwBfr2JKB2bGWiEd4=
 github.com/alexcesaro/mail v0.0.0-20141015155039-29068ce49a17 h1:S0JNYJ6Gv0RGmbz8w23BETY4hLz81RtpSiyqw3l4Z0k=

models/document.go

@@ -200,7 +200,12 @@ func (m *Document) ReleaseContent(bookId int, baseUrl string) {
 			beego.Error(err)
 			continue
 		}
-		if len(utils.GetTextFromHtml(ds.Content)) == 0 {
+
+		if strings.TrimSpace(utils.GetTextFromHtml(strings.Replace(ds.Markdown, "[TOC]", "", -1))) == "" {
+			// 如果markdown内容为空，则查询下一级目录内容来填充
+			ds.Markdown, ds.Content = item.BookStackAuto(bookId, ds.DocumentId)
+			ds.Markdown = "[TOC]\n\n" + ds.Markdown
+		} else if len(utils.GetTextFromHtml(ds.Content)) == 0 {
 			//内容为空，渲染一下文档，然后再重新获取
 			utils.RenderDocumentById(item.DocumentId)
 			ds, _ = ModelStore.GetById(item.DocumentId)
@@ -551,7 +556,7 @@ func (m *Document) BookStackAuto(bookId, docId int) (md, cont string) {
 	var newMd []string   //新markdown内容
 	for _, doc := range docs {
 		newMd = append(newMd, fmt.Sprintf(`- [%v]($%v)`, doc.DocumentName, doc.Identify))
-		newCont = append(newCont, fmt.Sprintf(`<li><a href="$%v">%v</a></li>`, doc.Identify, doc.DocumentName))
+		newCont = append(newCont, fmt.Sprintf(`<li><a href="%v">%v</a></li>`, doc.Identify, doc.DocumentName))
 	}
 	md = strings.Join(newMd, "\n")
 	cont = "<ul>" + strings.Join(newCont, "") + "</ul>"

utils/util.go

@@ -836,6 +836,10 @@ func MD5Sub16(str string) string {
 func JoinURL(rawURL string, urlPath string) string {
 	rawURL = strings.TrimSpace(rawURL)
 
+	if strings.HasPrefix(urlPath, "#") {
+		return urlPath
+	}
+
 	lowerURLPath := strings.ToLower(urlPath)
 	if strings.HasPrefix(lowerURLPath, "//") {
 		return "http:" + urlPath