diff --git a/converter/converter.go b/converter/converter.go index 375ab80b..e68c6ff4 100644 --- a/converter/converter.go +++ b/converter/converter.go @@ -476,12 +476,12 @@ func (this *Converter) convertToPdf() (err error) { //header template if len(this.Config.Header) > 0 { - args = append(args, "--pdf-header-template", this.Config.Header) + args = append(args, "--pdf-header-template", GetFooterOrHeaderParams(this.Config.Header)) } //footer template if len(this.Config.Footer) > 0 { - args = append(args, "--pdf-footer-template", this.Config.Footer) + args = append(args, "--pdf-footer-template",GetFooterOrHeaderParams(this.Config.Footer)) } if len(this.Config.MarginLeft) > 0 { diff --git a/converter/util.go b/converter/util.go index 5105acdb..f2ac1846 100644 --- a/converter/util.go +++ b/converter/util.go @@ -45,3 +45,7 @@ func parseConfig(configFile string) (cfg Config, err error) { } return } + +func GetFooterOrHeaderParams(v string) string { + return v +} \ No newline at end of file diff --git a/converter/util_linux.go b/converter/util_linux.go new file mode 100644 index 00000000..fc108b31 --- /dev/null +++ b/converter/util_linux.go @@ -0,0 +1,5 @@ +package converter + +func GetFooterOrHeaderParams(v string) string { + return "\"" + v +"\"" +} diff --git a/models/book_result.go b/models/book_result.go index 66e65ec8..dcbecb16 100644 --- a/models/book_result.go +++ b/models/book_result.go @@ -245,8 +245,8 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) { Cover: m.Cover, Timestamp: time.Now().Format("2006-01-02 15:04:05"), Description: string(blackfriday.MarkdownBasic([]byte(m.Description))), - Footer: "\"

本文档使用 MinDoc 构建 - _PAGENUM_ -

\"", - Header: "\"

_SECTION_

\"", + Footer: "

本文档使用 MinDoc 构建 - _PAGENUM_ -

", + Header: "

_SECTION_

", Identifier: "", Language: "zh-CN", Creator: m.CreateName, @@ -264,7 +264,7 @@ func (m *BookResult) Converter(sessionId string) (ConvertBookResult, error) { More: []string{}, } if m.Publisher != "" { - ebookConfig.Footer = "\"

本文档由 "+ m.Publisher +" 生成- _PAGENUM_ -

\"" + ebookConfig.Footer = "

本文档由 "+ m.Publisher +" 生成- _PAGENUM_ -

" } if tempOutputPath, err = filepath.Abs(tempOutputPath); err != nil { diff --git a/views/book/setting.tpl b/views/book/setting.tpl index c25a3366..76e0e9fc 100644 --- a/views/book/setting.tpl +++ b/views/book/setting.tpl @@ -65,8 +65,8 @@
- -

导出文档时的标识

+ +

导出文档PDF文档时显示的页脚