Merge branch 'ne' into dev-ne

Author: TruthHun88

commands/command.go

@@ -193,6 +193,13 @@ func RegisterFunction() {
 		}
 		return cdn + p
 	})
+	beego.AddFuncMap("parseICON", func(icon string) string {
+		icon = strings.TrimSpace(icon)
+		if strings.Contains(icon, "fa-") {
+			return fmt.Sprintf(`<i class="%s"></i>`, icon)
+		}
+		return fmt.Sprintf(`<img src="%s" class="icon-img" alt="icon"/>`, icon)
+	})
 	beego.AddFuncMap("getUsernameByUid", func(id interface{}) string {
 		return new(models.Member).GetUsernameByUid(id)
 	})

controllers/BaseController.go

@@ -216,6 +216,11 @@ func (this *BaseController) SetMember(member models.Member) {
 
 // JsonResult 响应 json 结果
 func (this *BaseController) JsonResult(errCode int, errMsg string, data ...interface{}) {
+	if !this.Ctx.Input.IsAjax() {
+		this.Data["Message"] = errMsg
+		this.Abort("404")
+	}
+
 	jsonData := make(map[string]interface{}, 3)
 	jsonData["errcode"] = errCode
 	jsonData["message"] = errMsg

controllers/BookController.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -195,7 +196,6 @@ func (this *BookController) Setting() {
 
 // SaveBook 保存书籍信息
 func (this *BookController) SaveBook() {
-
 	bookResult, err := this.IsPermission()
 	if err != nil {
 		this.JsonResult(6001, err.Error())
@@ -239,6 +239,7 @@ func (this *BookController) SaveBook() {
 	book.Lang = this.GetString("lang")
 	book.AdTitle = this.GetString("ad_title")
 	book.AdLink = this.GetString("ad_link")
+	_, book.NavJSON = this.parseBookNav()
 
 	if err := book.Update(); err != nil {
 		this.JsonResult(6006, "保存失败")
@@ -272,6 +273,47 @@ func (this *BookController) SaveBook() {
 	this.JsonResult(0, "ok", bookResult)
 }
 
+func (this *BookController) parseBookNav() (navs models.BookNavs, navStr string) {
+	var data struct {
+		Name   []string `json:"name"`
+		URL    []string `json:"url"`
+		Sort   []string `json:"sort"`
+		Icon   []string `json:"icon"`
+		Color  []string `json:"color"`
+		Target []string `json:"target"`
+	}
+	b, _ := json.Marshal(this.Ctx.Request.PostForm)
+	json.Unmarshal(b, &data)
+	lenName := len(data.Name)
+	if lenName == 0 || lenName != len(data.URL) || lenName != len(data.Sort) || lenName != len(data.Icon) || lenName != len(data.Color) || lenName != len(data.Target) {
+		return
+	}
+
+	for idx, name := range data.Name {
+		name = strings.TrimSpace(name)
+		url := strings.TrimSpace(data.URL[idx])
+		if url == "" || name == "" {
+			continue
+		}
+		nav := models.BookNav{
+			Name:   name,
+			URL:    url,
+			Color:  strings.TrimSpace(data.Color[idx]),
+			Icon:   strings.TrimSpace(data.Icon[idx]),
+			Target: strings.TrimSpace(data.Target[idx]),
+		}
+		nav.Sort, _ = strconv.Atoi(strings.TrimSpace(data.Sort[idx]))
+		navs = append(navs, nav)
+	}
+	if len(navs) > 0 {
+		// 排序
+		sort.Sort(navs)
+		b, _ := json.Marshal(navs)
+		navStr = string(b)
+	}
+	return
+}
+
 //设置书籍私有状态.
 func (this *BookController) PrivatelyOwned() {
 
@@ -610,6 +652,47 @@ func (this *BookController) Create() {
 	this.JsonResult(0, "ok", bookResult)
 }
 
+// Create 创建书籍.
+func (this *BookController) Copy() {
+	if opt, err := models.NewOption().FindByKey("ALL_CAN_WRITE_BOOK"); err == nil {
+		if opt.OptionValue == "false" && this.Member.Role == conf.MemberGeneralRole { // 读者无权限创建书籍
+			this.JsonResult(1, "普通读者无法创建书籍，如需创建书籍，请向管理员申请成为作者")
+		}
+	}
+	identify := strings.TrimSpace(this.GetString("identify", ""))
+	sourceIdentify := strings.TrimSpace(this.GetString("source_identify", ""))
+	sourceBook, err := models.NewBook().FindByIdentify(sourceIdentify)
+	if err != nil {
+		this.JsonResult(1, err.Error())
+	}
+	existBook, _ := models.NewBook().FindByIdentify(identify, "book_id")
+	if existBook != nil && existBook.BookId > 0 {
+		this.JsonResult(1, "请更换新的书籍标识")
+	}
+
+	// 如果是私有书籍，且不是团队的人，不允许拷贝该项目
+	if sourceBook.PrivatelyOwned == 1 {
+		rel, err := models.NewRelationship().FindByBookIdAndMemberId(sourceBook.BookId, this.Member.MemberId)
+		if err != nil || rel == nil || rel.RelationshipId == 0 {
+			this.JsonResult(1, "无拷贝书籍权限")
+		}
+	}
+	sourceBook.BookId = 0
+	sourceBook.BookName = strings.TrimSpace(this.GetString("book_name", ""))
+	sourceBook.Identify = identify
+	sourceBook.Description = strings.TrimSpace(this.GetString("description", ""))
+	sourceBook.Author = strings.TrimSpace(this.GetString("author", ""))
+	sourceBook.AuthorURL = strings.TrimSpace(this.GetString("author_url", ""))
+	sourceBook.PrivatelyOwned, _ = strconv.Atoi(this.GetString("privately_owned"))
+	sourceBook.MemberId = this.Member.MemberId
+	err = sourceBook.Copy(sourceIdentify)
+	if err != nil {
+		this.JsonResult(1, "拷贝书籍失败："+err.Error())
+	}
+
+	this.JsonResult(0, "拷贝书籍成功")
+}
+
 // CreateToken 创建访问来令牌.
 func (this *BookController) CreateToken() {
 	if this.forbidGeneralRole() {
@@ -702,6 +785,7 @@ func (this *BookController) Delete() {
 // 发布书籍.
 func (this *BookController) Release() {
 	identify := this.GetString("identify")
+	force, _ := this.GetBool("force")
 	bookId := 0
 	if this.Member.IsAdministrator() {
 		book, err := models.NewBook().FindByFieldFirst("identify", identify)
@@ -727,13 +811,7 @@ func (this *BookController) Release() {
 		bookId = book.BookId
 	}
 
-	if exist := utils.BooksRelease.Exist(bookId); exist {
-		this.JsonResult(1, "上次内容发布正在执行中，请稍后再操作")
-	}
-
-	go func(identify string) {
-		models.NewDocument().ReleaseContent(bookId, this.BaseUrl())
-	}(identify)
+	go models.NewDocument().ReleaseContent(bookId, this.BaseUrl(), force)
 
 	this.JsonResult(0, "发布任务已推送到任务队列，稍后将在后台执行。")
 }
@@ -1262,3 +1340,29 @@ func (this *BookController) Comment() {
 	}
 	this.JsonResult(1, "书籍不存在")
 }
+
+// ExportMarkdown 将书籍导出为markdown
+// 注意：系统管理员和书籍参与者有权限导出
+func (this *BookController) Export2Markdown() {
+	identify := this.GetString("identify")
+	if this.Member.MemberId == 0 {
+		this.JsonResult(1, "请先登录")
+	}
+	if !this.Member.IsAdministrator() {
+		if _, err := models.NewBookResult().FindByIdentify(identify, this.Member.MemberId); err != nil {
+			this.JsonResult(1, "无操作权限")
+		}
+	}
+	path, err := models.NewBook().Export2Markdown(identify)
+	if err != nil {
+		this.JsonResult(1, err.Error())
+	}
+	defer func() {
+		os.Remove(path)
+	}()
+	attchmentName := filepath.Base(path)
+	if book, _ := models.NewBook().FindByIdentify(identify, "book_name", "book_id"); book != nil && book.BookId > 0 {
+		attchmentName = book.BookName + ".zip"
+	}
+	this.Ctx.Output.Download(strings.TrimLeft(path, "./"), attchmentName)
+}

controllers/DocumentController.go

@@ -568,6 +568,7 @@ func (this *DocumentController) Create() {
 	parentId, _ := this.GetInt("parent_id", 0)
 	docId, _ := this.GetInt("doc_id", 0)
 	bookIdentify := strings.TrimSpace(this.GetString(":key"))
+
 	o := orm.NewOrm()
 
 	if identify == "" {
@@ -577,7 +578,6 @@ func (this *DocumentController) Create() {
 		this.JsonResult(6004, "文档名称不能为空")
 	}
 	if docIdentify != "" {
-
 		if ok, err := regexp.MatchString(`^[a-zA-Z0-9_\-\.]*$`, docIdentify); !ok || err != nil {
 			this.JsonResult(6003, "文档标识只能是数字、字母，以及“-”、“_”和“.”等字符，并且不能是纯数字")
 		}
@@ -600,7 +600,7 @@ func (this *DocumentController) Create() {
 			this.JsonResult(6006, "文档标识已被使用")
 		}
 	} else {
-		docIdentify = fmt.Sprintf("date-%v", time.Now().Format("2006.01.02.15.04.05"))
+		docIdentify = fmt.Sprintf("date%v", time.Now().Format("20060102150405.md"))
 	}
 
 	bookId := 0
@@ -633,6 +633,7 @@ func (this *DocumentController) Create() {
 
 	document.MemberId = this.Member.MemberId
 	document.BookId = bookId
+	oldIdentify := document.Identify
 	if docIdentify != "" {
 		document.Identify = docIdentify
 	}
@@ -653,6 +654,9 @@ func (this *DocumentController) Create() {
 			beego.Error(err)
 		}
 	}
+	if docId > 0 && oldIdentify != docIdentify {
+		go document.ReplaceIdentify(bookId, oldIdentify, docIdentify)
+	}
 	this.JsonResult(0, "ok", document)
 }
 
@@ -1241,7 +1245,7 @@ func (this *DocumentController) ExportOld() {
 	book, err := new(models.Book).FindByIdentify(identify)
 	if err != nil {
 		beego.Error(err.Error())
-		this.JsonResult(1, "下载失败，您要下载的文档当前并未生成可下载文档。")
+		this.JsonResult(1, "下载失败，您要下载的书籍当前并未生成可下载的电子书。")
 	}
 	if book.PrivatelyOwned == 1 && this.Member.MemberId != book.MemberId {
 		this.JsonResult(1, "私有文档，只有文档创建人可导出")
@@ -1253,14 +1257,14 @@ func (this *DocumentController) ExportOld() {
 	case utils.StoreOss:
 		if err := store.ModelStoreOss.IsObjectExist(obj); err != nil {
 			beego.Error(err, obj)
-			this.JsonResult(1, "下载失败，您要下载的文档当前并未生成可下载文档。")
+			this.JsonResult(1, "下载失败，您要下载的书籍当前并未生成可下载的电子书。")
 		}
 		link = this.OssDomain + "/" + obj
 	case utils.StoreLocal:
 		obj = "uploads/" + obj
 		if err := store.ModelStoreLocal.IsObjectExist(obj); err != nil {
 			beego.Error(err, obj)
-			this.JsonResult(1, "下载失败，您要下载的文档当前并未生成可下载文档。")
+			this.JsonResult(1, "下载失败，您要下载的书籍当前并未生成可下载的电子书。")
 		}
 		link = "/" + obj
 	}
@@ -1276,7 +1280,7 @@ func (this *DocumentController) ExportOld() {
 		}
 		this.JsonResult(0, "获取文档下载链接成功", map[string]interface{}{"url": link})
 	}
-	this.JsonResult(1, "下载失败，您要下载的文档当前并未生成可下载文档。")
+	this.JsonResult(1, "下载失败，您要下载的书籍当前并未生成可下载的电子书。")
 }
 
 //导出文件

controllers/StaticController.go

@@ -32,6 +32,11 @@ func (this *StaticController) APP() {
 	this.Abort("404")
 }
 
+func (this *StaticController) Test() {
+	// fmt.Println(models.NewBook().Export2Markdown("4b98937398e612778711608a3d09a9c4"))
+	this.Ctx.WriteString("this is a test")
+}
+
 // Uploads 查询上传的静态资源。
 // 如果是音频和视频文件，需要根据后台设置而判断是否加密处理
 // 如果使用了OSS存储，则需要将文件处理好

go.mod

@@ -6,7 +6,7 @@ replace github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 => github.
 
 require (
 	github.com/PuerkitoBio/goquery v1.6.0
-	github.com/TruthHun/converter v0.0.0-20210616133600-fb06ddba4a35
+	github.com/TruthHun/converter v0.0.0-20210623150616-172c168cdcda
 	github.com/TruthHun/gotil v0.0.0-20210509080330-2470bb9be7cd
 	github.com/TruthHun/html2article v0.0.0-20180202140721-67d6ff09647b
 	github.com/TruthHun/html2json v0.0.0-20201228115506-dee0570dffa8

go.sum

@@ -11,6 +11,8 @@ github.com/TruthHun/converter v0.0.0-20180618131031-80268d67d7a8 h1:E+006K+eHyJk
 github.com/TruthHun/converter v0.0.0-20180618131031-80268d67d7a8/go.mod h1:bW/ArSdu0OB6XR3NcPdPBIEeGdQ1GLW9fQavW3Auy2A=
 github.com/TruthHun/converter v0.0.0-20210616133600-fb06ddba4a35 h1:g1zMxNHQVGA6LqlJ0r923Xft+GO6TXU399k/HBILpHM=
 github.com/TruthHun/converter v0.0.0-20210616133600-fb06ddba4a35/go.mod h1:n0OITYsMcCW3XbBVOBn3jMiXRuCmDwDXPsumL7D/JBY=
+github.com/TruthHun/converter v0.0.0-20210623150616-172c168cdcda h1:5J7hfnVImIf2MsBp7NZ+YrmcSrKUy5rW5sonkMxHkfY=
+github.com/TruthHun/converter v0.0.0-20210623150616-172c168cdcda/go.mod h1:n0OITYsMcCW3XbBVOBn3jMiXRuCmDwDXPsumL7D/JBY=
 github.com/TruthHun/gotil v0.0.0-20191003091818-17b80aad8a45 h1:o+hC+QvRJlpj6meIX4AC/LKi7UxdEWFs+6zOsLzGoBs=
 github.com/TruthHun/gotil v0.0.0-20191003091818-17b80aad8a45/go.mod h1:0V5BlPJa24R0PzuXVURUfjaQ8Z7cmqsVSW7ftuhesN0=
 github.com/TruthHun/gotil v0.0.0-20210509080330-2470bb9be7cd h1:WHNNuPS7Pc4rYhlN2mAPT4lXgGYNwX4tws8+DbfYSJY=

main.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/TruthHun/BookStack/utils"
+	"github.com/astaxie/beego"
 
 	"github.com/TruthHun/BookStack/commands"
 	"github.com/TruthHun/BookStack/commands/daemon"
@@ -14,6 +15,8 @@ import (
 )
 
 func main() {
+	// https://beego.me/docs/mvc/controller/config.md#app-%E9%85%8D%E7%BD%AE
+	beego.BConfig.MaxMemory = 1 << 26 * 1024 // 设置最大内存，64GB
 	if len(os.Args) >= 3 && os.Args[1] == "service" {
 		if os.Args[2] == "install" {
 			daemon.Install()