lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2026-02-27 17:03:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1、实现项目队列转换节省资源

Browse Source 
2、实现同一个项目通过配置限定转换线程
3、修复转换Word没有图片的问题
4、优化Mac下单页打印中文字体无法显示的问题
This commit is contained in:
lifei6671
2018-07-10 16:26:25 +08:00
parent 01084c7b0b
commit 483df1f67b
10 changed files with 317 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/BaseController.go
View File

@@ -154,7 +154,7 @@ func (c *BaseController) ShowErrorPage(errCode int, errMsg string) {
var buf bytes.Buffer
if err := beego.ExecuteViewPathTemplate(&buf, "document/export.tpl", beego.BConfig.WebConfig.ViewsPath, map[string]interface{}{"ErrorMessage": errMsg, "errCode": errCode, "BaseUrl": conf.BaseUrl}); err != nil {
if err := beego.ExecuteViewPathTemplate(&buf, "errors/error.tpl", beego.BConfig.WebConfig.ViewsPath, map[string]interface{}{"ErrorMessage": errMsg, "ErrorCode": errCode, "BaseUrl": conf.BaseUrl}); err != nil {
c.Abort("500")
}

32
controllers/DocumentController.go
View File

@@ -28,6 +28,7 @@ import (
"gopkg.in/russross/blackfriday.v2"
"github.com/lifei6671/mindoc/utils/cryptil"
"fmt"
"github.com/lifei6671/mindoc/utils/filetil"
)
// DocumentController struct
@@ -857,29 +858,32 @@ func (c *DocumentController) Export() {
return
}
eBookResult, err := bookResult.Converter(c.CruSession.SessionID())
outputPath := filepath.Join(conf.WorkingDirectory, "uploads", "books", strconv.Itoa(bookResult.BookId))
if err != nil {
beego.Error("转换文档失败：" + bookResult.BookName + " -> " + err.Error())
c.Abort("500")
}
pdfpath := filepath.Join(outputPath, "book.pdf")
epubpath := filepath.Join(outputPath, "book.epub")
mobipath := filepath.Join(outputPath, "book.mobi")
docxpath := filepath.Join(outputPath, "book.docx")
if output == "pdf" {
c.Ctx.Output.Download(eBookResult.PDFPath, bookResult.BookName+".pdf")
if output == "pdf" && filetil.FileExists(pdfpath){
c.Ctx.Output.Download(pdfpath, bookResult.BookName+".pdf")
c.Abort("200")
} else if output == "epub" && filetil.FileExists(epubpath){
c.Ctx.Output.Download(epubpath, bookResult.BookName+".epub")
c.Abort("200")
} else if output == "epub" {
c.Ctx.Output.Download(eBookResult.EpubPath, bookResult.BookName+".epub")
} else if output == "mobi" && filetil.FileExists(mobipath) {
c.Ctx.Output.Download(mobipath, bookResult.BookName+".mobi")
c.Abort("200")
} else if output == "mobi" {
c.Ctx.Output.Download(eBookResult.MobiPath, bookResult.BookName+".mobi")
} else if output == "docx" && filetil.FileExists(docxpath){
c.Ctx.Output.Download(docxpath, bookResult.BookName+".docx")
c.Abort("200")
} else if output == "docx" {
c.Ctx.Output.Download(eBookResult.WordPath, bookResult.BookName+".docx")
c.Abort("200")
}else if output == "pdf" || output == "epub" || output == "docx" || output == "mobi"{
models.BackgroupConvert(c.CruSession.SessionID(),bookResult)
c.ShowErrorPage(200,"文档正在后台转换，请稍后再下载")
}else{
c.ShowErrorPage(200,"不支持的文件格式")
}