lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-06-28 15:45:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat:1、增加文档和文章的危险标签和属性过滤

Browse Source 
2、移除文档的客户端缓存
This commit is contained in:
lifei6671 2018-09-13 18:19:26 +08:00
parent 91d010664b
commit 732b1db281
8 changed files with 282 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
controllers/DocumentController.go
View File

@ -137,59 +137,23 @@ func (c *DocumentController) Read() {
c.ShowErrorPage(404, "文档不存在或已删除") c.ShowErrorPage(404, "文档不存在或已删除")
} }
doc.Processor()
attach, err := models.NewAttachment().FindListByDocumentId(doc.DocumentId) attach, err := models.NewAttachment().FindListByDocumentId(doc.DocumentId)
if err == nil { if err == nil {
doc.AttachList = attach doc.AttachList = attach
} }
cdnimg := beego.AppConfig.String("cdnimg")
if doc.Release != "" && cdnimg != "" {
query, err := goquery.NewDocumentFromReader(bytes.NewBufferString(doc.Release))
if err != nil {
beego.Error(err)
} else {
query.Find("img").Each(func(i int, contentSelection *goquery.Selection) {
if src, ok := contentSelection.Attr("src"); ok && strings.HasPrefix(src, "/uploads/") {
contentSelection.SetAttr("src", utils.JoinURI(cdnimg, src))
}
})
html, err := query.Html()
if err != nil {
beego.Error(err)
} else {
doc.Release = html
}
}
}
// assemble doc info, added by dandycheung, 2017-12-20
docInfo := ""
docCreator, err := models.NewMember().Find(doc.MemberId)
if err == nil {
docInfo += docCreator.Account
}
docInfo += " 创建于 "
docInfo += doc.CreateTime.Local().Format("2006-01-02 15:04")
if doc.ModifyTime != doc.CreateTime {
docInfo += "；更新于 "
docInfo += doc.ModifyTime.Local().Format("2006-01-02 15:04")
}
if c.IsAjax() { if c.IsAjax() {
var data struct { var data struct {
DocTitle string `json:"doc_title"` DocTitle string `json:"doc_title"`
Body string `json:"body"` Body string `json:"body"`
Title string `json:"title"` Title string `json:"title"`
DocInfo string `json:"doc_info"`
Version int64 `json:"version"` Version int64 `json:"version"`
} }
data.DocTitle = doc.DocumentName data.DocTitle = doc.DocumentName
data.Body = doc.Release data.Body = doc.Release
data.Title = doc.DocumentName + " - Powered by MinDoc" data.Title = doc.DocumentName + " - Powered by MinDoc"
data.DocInfo = docInfo
data.Version = doc.Version data.Version = doc.Version
c.JsonResult(0, "ok", data) c.JsonResult(0, "ok", data)
@ -208,7 +172,6 @@ func (c *DocumentController) Read() {
c.Data["Model"] = bookResult c.Data["Model"] = bookResult
c.Data["Result"] = template.HTML(tree) c.Data["Result"] = template.HTML(tree)
c.Data["Title"] = doc.DocumentName c.Data["Title"] = doc.DocumentName
c.Data["Info"] = docInfo
c.Data["Content"] = template.HTML(doc.Release) c.Data["Content"] = template.HTML(doc.Release)
} }

66
models/Blog.go
View File

@ -9,7 +9,8 @@ import (
"fmt" "fmt"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
"strings" "strings"
"github.com/qiniu/x/bytes.v7" "bytes"
"github.com/lifei6671/mindoc/utils"
) )
//博文表 //博文表
@ -218,7 +219,9 @@ func (b *Blog) Save(cols ...string) error {
} }
} }
var err error var err error
b.Version = time.Now().Unix()
b.Processor().Version = time.Now().Unix()
if b.BlogId > 0 { if b.BlogId > 0 {
b.Modified = time.Now() b.Modified = time.Now()
_,err = o.Update(b,cols...) _,err = o.Update(b,cols...)
@ -230,34 +233,45 @@ func (b *Blog) Save(cols ...string) error {
b.Created = time.Now() b.Created = time.Now()
_,err = o.Insert(b) _,err = o.Insert(b)
} }
//如果保存成功，则在后台处理文章中存在的外链问题
if err == nil {
go func(blog *Blog) {
bufio := bytes.NewReader([]byte(b.BlogRelease))
//解析文档中非本站的链接，并设置为新窗口打开
if content, err := goquery.NewDocumentFromReader(bufio); err == nil {
content.Find("a").Each(func(i int, contentSelection *goquery.Selection) {
if src, ok := contentSelection.Attr("href"); ok {
if strings.HasPrefix(src, "http://") || strings.HasPrefix(src, "https://") {
//beego.Info(src,conf.BaseUrl,strings.HasPrefix(src,conf.BaseUrl))
if conf.BaseUrl != "" && !strings.HasPrefix(src, conf.BaseUrl) {
contentSelection.SetAttr("target", "_blank")
if html, err := content.Html(); err == nil {
b.BlogRelease = html
}
}
}
}
})
}
o.Update(blog)
}(b)
}
return err return err
} }
//过滤文章的危险标签，处理文章外链以及图片.
func (b *Blog) Processor() *Blog {
b.BlogRelease = utils.SafetyProcessor(b.BlogRelease)
//解析文档中非本站的链接，并设置为新窗口打开
if content, err := goquery.NewDocumentFromReader(bytes.NewBufferString(b.BlogRelease)); err == nil {
content.Find("a").Each(func(i int, contentSelection *goquery.Selection) {
if src, ok := contentSelection.Attr("href"); ok {
if strings.HasPrefix(src, "http://") || strings.HasPrefix(src, "https://") {
//beego.Info(src,conf.BaseUrl,strings.HasPrefix(src,conf.BaseUrl))
if conf.BaseUrl != "" && !strings.HasPrefix(src, conf.BaseUrl) {
contentSelection.SetAttr("target", "_blank")
if html, err := content.Html(); err == nil {
b.BlogRelease = html
}
}
}
}
})
//设置图片为CDN地址
if cdnimg := beego.AppConfig.String("cdnimg"); cdnimg != "" {
content.Find("img").Each(func(i int, contentSelection *goquery.Selection) {
if src, ok := contentSelection.Attr("src"); ok && strings.HasPrefix(src, "/uploads/") {
contentSelection.SetAttr("src", utils.JoinURI(cdnimg, src))
}
})
}
}
return b
}
//分页查询文章列表 //分页查询文章列表
func (b *Blog) FindToPager(pageIndex, pageSize int,memberId int,status string) (blogList []*Blog, totalCount int, err error) { func (b *Blog) FindToPager(pageIndex, pageSize int,memberId int,status string) (blogList []*Blog, totalCount int, err error) {

2
models/BookModel.go
View File

@ -520,7 +520,7 @@ func (book *Book) ReleaseContent(bookId int) {
o := orm.NewOrm() o := orm.NewOrm()
var docs []*Document var docs []*Document
_, err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("book_id", bookId).All(&docs, "document_id", "identify", "content") _, err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("book_id", bookId).All(&docs)
if err != nil { if err != nil {
beego.Error("发布失败 =>",bookId, err) beego.Error("发布失败 =>",bookId, err)

297
models/DocumentModel.go
View File

@ -10,11 +10,12 @@ import (
"github.com/astaxie/beego/orm" "github.com/astaxie/beego/orm"
"github.com/lifei6671/mindoc/cache" "github.com/lifei6671/mindoc/cache"
"github.com/lifei6671/mindoc/conf" "github.com/lifei6671/mindoc/conf"
"github.com/PuerkitoBio/goquery"
"strings"
"bytes"
"os" "os"
"path/filepath" "path/filepath"
"github.com/PuerkitoBio/goquery"
"bytes"
"strings"
"github.com/lifei6671/mindoc/utils"
) )
// Document struct. // Document struct.
@ -31,36 +32,36 @@ type Document struct {
// Release 发布后的Html格式内容. // Release 发布后的Html格式内容.
Release string `orm:"column(release);type(text);null" json:"release"` Release string `orm:"column(release);type(text);null" json:"release"`
// Content 未发布的 Html 格式内容. // Content 未发布的 Html 格式内容.
Content string `orm:"column(content);type(text);null" json:"content"` Content string `orm:"column(content);type(text);null" json:"content"`
CreateTime time.Time `orm:"column(create_time);type(datetime);auto_now_add" json:"create_time"` CreateTime time.Time `orm:"column(create_time);type(datetime);auto_now_add" json:"create_time"`
MemberId int `orm:"column(member_id);type(int)" json:"member_id"` MemberId int `orm:"column(member_id);type(int)" json:"member_id"`
ModifyTime time.Time `orm:"column(modify_time);type(datetime);auto_now" json:"modify_time"` ModifyTime time.Time `orm:"column(modify_time);type(datetime);auto_now" json:"modify_time"`
ModifyAt int `orm:"column(modify_at);type(int)" json:"-"` ModifyAt int `orm:"column(modify_at);type(int)" json:"-"`
Version int64 `orm:"column(version);type(bigint);" json:"version"` Version int64 `orm:"column(version);type(bigint);" json:"version"`
//是否展开子目录：0 否/1 是 //是否展开子目录：0 否/1 是
IsOpen int `orm:"column(is_open);type(int);default(0)" json:"is_open"` IsOpen int `orm:"column(is_open);type(int);default(0)" json:"is_open"`
AttachList []*Attachment `orm:"-" json:"attach"` AttachList []*Attachment `orm:"-" json:"attach"`
} }
// 多字段唯一键 // 多字段唯一键
func (m *Document) TableUnique() [][]string { func (item *Document) TableUnique() [][]string {
return [][]string{ return [][]string{
[]string{"book_id", "identify"}, []string{"book_id", "identify"},
} }
} }
// TableName 获取对应数据库表名. // TableName 获取对应数据库表名.
func (m *Document) TableName() string { func (item *Document) TableName() string {
return "documents" return "documents"
} }
// TableEngine 获取数据使用的引擎. // TableEngine 获取数据使用的引擎.
func (m *Document) TableEngine() string { func (item *Document) TableEngine() string {
return "INNODB" return "INNODB"
} }
func (m *Document) TableNameWithPrefix() string { func (item *Document) TableNameWithPrefix() string {
return conf.GetDatabasePrefix() + m.TableName() return conf.GetDatabasePrefix() + item.TableName()
} }
func NewDocument() *Document { func NewDocument() *Document {
@ -70,45 +71,45 @@ func NewDocument() *Document {
} }
//根据文档ID查询指定文档. //根据文档ID查询指定文档.
func (m *Document) Find(id int) (*Document, error) { func (item *Document) Find(id int) (*Document, error) {
if id <= 0 { if id <= 0 {
return m, ErrInvalidParameter return item, ErrInvalidParameter
} }
o := orm.NewOrm() o := orm.NewOrm()
err := o.QueryTable(m.TableNameWithPrefix()).Filter("document_id", id).One(m) err := o.QueryTable(item.TableNameWithPrefix()).Filter("document_id", id).One(item)
if err == orm.ErrNoRows { if err == orm.ErrNoRows {
return m, ErrDataNotExist return item, ErrDataNotExist
} }
return m, nil return item, nil
} }
//插入和更新文档. //插入和更新文档.
func (m *Document) InsertOrUpdate(cols ...string) error { func (item *Document) InsertOrUpdate(cols ...string) error {
o := orm.NewOrm() o := orm.NewOrm()
var err error var err error
if m.DocumentId > 0 { if item.DocumentId > 0 {
_, err = o.Update(m, cols...) _, err = o.Update(item, cols...)
} else { } else {
if m.Identify == "" { if item.Identify == "" {
book := NewBook() book := NewBook()
identify := "docs" identify := "docs"
if err := o.QueryTable(book.TableNameWithPrefix()).Filter("book_id", m.BookId).One(book, "identify"); err == nil { if err := o.QueryTable(book.TableNameWithPrefix()).Filter("book_id", item.BookId).One(book, "identify"); err == nil {
identify = book.Identify identify = book.Identify
} }
m.Identify = fmt.Sprintf("%s-%s", identify, strconv.FormatInt(time.Now().UnixNano(), 32)) item.Identify = fmt.Sprintf("%s-%s", identify, strconv.FormatInt(time.Now().UnixNano(), 32))
} }
if m.OrderSort == 0 { if item.OrderSort == 0 {
sort, _ := o.QueryTable(m.TableNameWithPrefix()).Filter("book_id", m.BookId).Filter("parent_id", m.ParentId).Count() sort, _ := o.QueryTable(item.TableNameWithPrefix()).Filter("book_id", item.BookId).Filter("parent_id", item.ParentId).Count()
m.OrderSort = int(sort) + 1 item.OrderSort = int(sort) + 1
} }
_, err = o.Insert(m) _, err = o.Insert(item)
NewBook().ResetDocumentNumber(m.BookId) NewBook().ResetDocumentNumber(item.BookId)
} }
if err != nil { if err != nil {
return err return err
@ -118,36 +119,36 @@ func (m *Document) InsertOrUpdate(cols ...string) error {
} }
//根据文档识别编号和项目id获取一篇文档 //根据文档识别编号和项目id获取一篇文档
func (m *Document) FindByIdentityFirst(identify string, bookId int) (*Document, error) { func (item *Document) FindByIdentityFirst(identify string, bookId int) (*Document, error) {
o := orm.NewOrm() o := orm.NewOrm()
err := o.QueryTable(m.TableNameWithPrefix()).Filter("book_id", bookId).Filter("identify", identify).One(m) err := o.QueryTable(item.TableNameWithPrefix()).Filter("book_id", bookId).Filter("identify", identify).One(item)
return m, err return item, err
} }
//递归删除一个文档. //递归删除一个文档.
func (m *Document) RecursiveDocument(docId int) error { func (item *Document) RecursiveDocument(docId int) error {
o := orm.NewOrm() o := orm.NewOrm()
if doc, err := m.Find(docId); err == nil { if doc, err := item.Find(docId); err == nil {
o.Delete(doc) o.Delete(doc)
NewDocumentHistory().Clear(doc.DocumentId) NewDocumentHistory().Clear(doc.DocumentId)
} }
var maps []orm.Params var maps []orm.Params
_, err := o.Raw("SELECT document_id FROM " + m.TableNameWithPrefix() + " WHERE parent_id=" + strconv.Itoa(docId)).Values(&maps) _, err := o.Raw("SELECT document_id FROM " + item.TableNameWithPrefix() + " WHERE parent_id=" + strconv.Itoa(docId)).Values(&maps)
if err != nil { if err != nil {
beego.Error("RecursiveDocument => ", err) beego.Error("RecursiveDocument => ", err)
return err return err
} }
for _, item := range maps { for _, param := range maps {
if docId, ok := item["document_id"].(string); ok { if docId, ok := param["document_id"].(string); ok {
id, _ := strconv.Atoi(docId) id, _ := strconv.Atoi(docId)
o.QueryTable(m.TableNameWithPrefix()).Filter("document_id", id).Delete() o.QueryTable(item.TableNameWithPrefix()).Filter("document_id", id).Delete()
m.RecursiveDocument(id) item.RecursiveDocument(id)
} }
} }
@ -155,7 +156,7 @@ func (m *Document) RecursiveDocument(docId int) error {
} }
//将文档写入缓存 //将文档写入缓存
func (m *Document) PutToCache() { func (item *Document) PutToCache() {
go func(m Document) { go func(m Document) {
if m.Identify == "" { if m.Identify == "" {
@ -169,166 +170,170 @@ func (m *Document) PutToCache() {
} }
} }
}(*m) }(*item)
} }
//清除缓存 //清除缓存
func (m *Document) RemoveCache() { func (item *Document) RemoveCache() {
go func(m Document) { go func(m Document) {
cache.Put("Document.Id."+strconv.Itoa(m.DocumentId), m, time.Second*3600) cache.Put("Document.Id."+strconv.Itoa(m.DocumentId), m, time.Second*3600)
if m.Identify != "" { if m.Identify != "" {
cache.Put(fmt.Sprintf("Document.BookId.%d.Identify.%s", m.BookId, m.Identify), m, time.Second*3600) cache.Put(fmt.Sprintf("Document.BookId.%d.Identify.%s", m.BookId, m.Identify), m, time.Second*3600)
} }
}(*m) }(*item)
} }
//从缓存获取 //从缓存获取
func (m *Document) FromCacheById(id int) (*Document, error) { func (item *Document) FromCacheById(id int) (*Document, error) {
if err := cache.Get("Document.Id."+strconv.Itoa(id), &m); err == nil && m.DocumentId > 0 { if err := cache.Get("Document.Id."+strconv.Itoa(id), &item); err == nil && item.DocumentId > 0 {
beego.Info("从缓存中获取文档信息成功 ->", m.DocumentId) beego.Info("从缓存中获取文档信息成功 ->", item.DocumentId)
return m, nil return item, nil
} }
if m.DocumentId > 0 { if item.DocumentId > 0 {
m.PutToCache() item.PutToCache()
} }
m, err := m.Find(id) item, err := item.Find(id)
if err == nil { if err == nil {
m.PutToCache() item.PutToCache()
} }
return m, err return item, err
} }
//根据文档标识从缓存中查询文档 //根据文档标识从缓存中查询文档
func (m *Document) FromCacheByIdentify(identify string, bookId int) (*Document, error) { func (item *Document) FromCacheByIdentify(identify string, bookId int) (*Document, error) {
key := fmt.Sprintf("Document.BookId.%d.Identify.%s", bookId, identify) key := fmt.Sprintf("Document.BookId.%d.Identify.%s", bookId, identify)
if err := cache.Get(key, m); err == nil && m.DocumentId > 0 { if err := cache.Get(key, item); err == nil && item.DocumentId > 0 {
beego.Info("从缓存中获取文档信息成功 ->", key) beego.Info("从缓存中获取文档信息成功 ->", key)
return m, nil return item, nil
} }
defer func() { defer func() {
if m.DocumentId > 0 { if item.DocumentId > 0 {
m.PutToCache() item.PutToCache()
} }
}() }()
return m.FindByIdentityFirst(identify, bookId) return item.FindByIdentityFirst(identify, bookId)
} }
//根据项目ID查询文档列表. //根据项目ID查询文档列表.
func (m *Document) FindListByBookId(bookId int) (docs []*Document, err error) { func (item *Document) FindListByBookId(bookId int) (docs []*Document, err error) {
o := orm.NewOrm() o := orm.NewOrm()
_, err = o.QueryTable(m.TableNameWithPrefix()).Filter("book_id", bookId).OrderBy("order_sort").All(&docs) _, err = o.QueryTable(item.TableNameWithPrefix()).Filter("book_id", bookId).OrderBy("order_sort").All(&docs)
return return
} }
//判断文章是否存在 //判断文章是否存在
func (m *Document) IsExist(documentId int) bool { func (item *Document) IsExist(documentId int) bool {
o := orm.NewOrm() o := orm.NewOrm()
return o.QueryTable(m.TableNameWithPrefix()).Filter("document_id", documentId).Exist() return o.QueryTable(item.TableNameWithPrefix()).Filter("document_id", documentId).Exist()
} }
//发布单篇文档 //发布单篇文档
func (item *Document) ReleaseContent() error { func (item *Document) ReleaseContent() error {
o := orm.NewOrm() item.Release = strings.TrimSpace(item.Content)
bookId := item.BookId err := item.Processor().InsertOrUpdate("release")
var docQuery *goquery.Document if err != nil {
var err error beego.Error(fmt.Sprintf("发布失败 -> %+v", item), err)
return err
}
//当文档发布后，需要清除已缓存的转换文档和文档缓存
item.RemoveCache()
if item.Content != "" { if err := os.RemoveAll(filepath.Join(conf.WorkingDirectory, "uploads", "books", strconv.Itoa(item.BookId))); err != nil {
item.Release = item.Content beego.Error("删除已缓存的文档目录失败 -> ", filepath.Join(conf.WorkingDirectory, "uploads", "books", strconv.Itoa(item.BookId)))
bufio := bytes.NewReader([]byte(item.Content)) return err
//解析文档中非本站的链接，并设置为新窗口打开 }
if docQuery, err = goquery.NewDocumentFromReader(bufio); err == nil {
docQuery.Find("a").Each(func(i int, contentSelection *goquery.Selection) { return nil
if src, ok := contentSelection.Attr("href"); ok { }
if strings.HasPrefix(src, "http://") || strings.HasPrefix(src, "https://") {
if conf.BaseUrl != "" && !strings.HasPrefix(src, conf.BaseUrl) { //处理文档的外链，附件，底部编辑信息等.
contentSelection.SetAttr("target", "_blank") func (item *Document) Processor() *Document {
if item.Release != "" {
item.Release = utils.SafetyProcessor(item.Release)
//安全过滤，移除危险标签和属性
if docQuery, err := goquery.NewDocumentFromReader(bytes.NewBufferString(item.Release)); err == nil {
//处理附件
if selector := docQuery.Find("div.attach-list").First(); selector.Size() <= 0 {
//处理附件
attachList, err := NewAttachment().FindListByDocumentId(item.DocumentId)
if err == nil && len(attachList) > 0 {
content := bytes.NewBufferString("<div class=\"attach-list\"><strong>附件</strong><ul>")
for _, attach := range attachList {
if strings.HasPrefix(attach.HttpPath, "/") {
attach.HttpPath = strings.TrimSuffix(conf.BaseUrl, "/") + attach.HttpPath
}
li := fmt.Sprintf("<li><a href=\"%s\" target=\"_blank\" title=\"%s\">%s</a></li>", attach.HttpPath, attach.FileName, attach.FileName)
content.WriteString(li)
}
content.WriteString("</ul></div>")
if docQuery == nil {
docQuery, err = goquery.NewDocumentFromReader(content);
} else {
if selector := docQuery.Find("div.wiki-bottom").First(); selector.Size() > 0 {
selector.BeforeHtml(content.String())
} else if selector := docQuery.Find("div.markdown-article").First(); selector.Size() > 0 {
selector.AppendHtml(content.String())
} else if selector := docQuery.Find("article.markdown-article-inner").First(); selector.Size() > 0 {
selector.AppendHtml(content.String())
} else {
docQuery.Children().WrapHtml("<article class=\"markdown-article-inner\"></article>").AppendHtml(content.String())
} }
} }
} }
})
}
}
//处理附件
attachList, err := NewAttachment().FindListByDocumentId(item.DocumentId)
if err == nil && len(attachList) > 0 {
content := bytes.NewBufferString("<div class=\"attach-list\"><strong>附件</strong><ul>")
for _, attach := range attachList {
if strings.HasPrefix(attach.HttpPath, "/") {
attach.HttpPath = strings.TrimSuffix(conf.BaseUrl, "/") + attach.HttpPath
} }
li := fmt.Sprintf("<li><a href=\"%s\" target=\"_blank\" title=\"%s\">%s</a></li>", attach.HttpPath, attach.FileName, attach.FileName)
content.WriteString(li) //处理了文档底部信息
} if selector := docQuery.Find("div.wiki-bottom").First(); selector.Size() <= 0 && item.MemberId > 0 {
content.WriteString("</ul></div>") //处理文档结尾信息
if docQuery == nil { docCreator, err := NewMember().Find(item.MemberId, "real_name", "account")
docQuery ,err = goquery.NewDocumentFromReader(content); release := "<div class=\"wiki-bottom\">文档更新时间: " + item.ModifyTime.Local().Format("2006-01-02 15:04") + " &nbsp;&nbsp;作者："
}else { if err == nil && docCreator != nil {
if selector := docQuery.Find("div.markdown-article").First(); selector.Size() > 0{ if docCreator.RealName != "" {
selector.AppendHtml(content.String()) release += docCreator.RealName
}else{ } else {
docQuery.Find("article.markdown-article-inner").First().AppendHtml(content.String()) release += docCreator.Account
}
}
release += "</div>"
if selector := docQuery.Find("div.markdown-article").First(); selector.Size() > 0 {
selector.AppendHtml(release)
} else if selector := docQuery.Find("article.markdown-article-inner").First(); selector.Size() > 0 {
selector.First().AppendHtml(release)
} else {
docQuery.Children().WrapHtml("<article class=\"markdown-article-inner\"></article>").AppendHtml(release);
}
}
//设置图片为CDN地址
if cdnimg := beego.AppConfig.String("cdnimg"); cdnimg != "" {
docQuery.Find("img").Each(func(i int, contentSelection *goquery.Selection) {
if src, ok := contentSelection.Attr("src"); ok && strings.HasPrefix(src, "/uploads/") {
contentSelection.SetAttr("src", utils.JoinURI(cdnimg, src))
}
})
}
if html, err := docQuery.Html(); err == nil {
item.Release = strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(html), "<html><head></head><body>"), "</body></html>")
} }
} }
} }
return item
//处理格式化后的文档内容 }
if docQuery != nil {
//处理文档结尾信息
docCreator, err := NewMember().Find(item.MemberId,"real_name","account")
release := "<div class=\"wiki-bottom\">文档更新时间: " + item.ModifyTime.Local().Format("2006-01-02 15:04") + " &nbsp;&nbsp;作者："
if err == nil && docCreator != nil {
if docCreator.RealName != "" {
release += docCreator.RealName
} else {
release += docCreator.Account
}
}
release += "</div>"
if selector := docQuery.Find("div.markdown-article").First() ; selector.Size() > 0{
beego.Info(selector)
selector.AppendHtml(release)
}else{
docQuery.Find("article.markdown-article-inner").First().AppendHtml(release)
}
if html, err := docQuery.Html(); err == nil {
item.Release = strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(html), "<html><head></head><body>"), "</body></html>")
}
}
_, err = o.Update(item, "release")
if err != nil {
beego.Error(fmt.Sprintf("发布失败 => %+v", item), err)
return err
} else {
//当文档发布后，需要清除已缓存的转换文档和文档缓存
if doc, err := NewDocument().Find(item.DocumentId); err == nil {
doc.PutToCache()
} else {
doc.RemoveCache()
}
if err := os.RemoveAll(filepath.Join(conf.WorkingDirectory, "uploads", "books", strconv.Itoa(bookId))); err != nil {
beego.Error("删除已缓存的文档目录失败 => ",filepath.Join(conf.WorkingDirectory, "uploads", "books", strconv.Itoa(bookId)))
return err
}
}
return nil
}

8
models/DocumentTree.go
View File

@ -25,14 +25,14 @@ type DocumentSelected struct {
} }
//获取项目的文档树状结构 //获取项目的文档树状结构
func (m *Document) FindDocumentTree(bookId int) ([]*DocumentTree, error) { func (item *Document) FindDocumentTree(bookId int) ([]*DocumentTree, error) {
o := orm.NewOrm() o := orm.NewOrm()
trees := make([]*DocumentTree, 0) trees := make([]*DocumentTree, 0)
var docs []*Document var docs []*Document
count, err := o.QueryTable(m).Filter("book_id", bookId).OrderBy("order_sort", "document_id").Limit(math.MaxInt32).All(&docs, "document_id", "version", "document_name", "parent_id", "identify","is_open") count, err := o.QueryTable(item).Filter("book_id", bookId).OrderBy("order_sort", "document_id").Limit(math.MaxInt32).All(&docs, "document_id", "version", "document_name", "parent_id", "identify","is_open")
if err != nil { if err != nil {
return trees, err return trees, err
@ -68,8 +68,8 @@ func (m *Document) FindDocumentTree(bookId int) ([]*DocumentTree, error) {
return trees, nil return trees, nil
} }
func (m *Document) CreateDocumentTreeForHtml(bookId, selectedId int) (string, error) { func (item *Document) CreateDocumentTreeForHtml(bookId, selectedId int) (string, error) {
trees, err := m.FindDocumentTree(bookId) trees, err := item.FindDocumentTree(bookId)
if err != nil { if err != nil {
return "", err return "", err
} }

1
static/editor.md/editormd.js
View File

@ -3981,7 +3981,6 @@
html = new String(html); html = new String(html);
} }
html = '<article class="markdown-article-inner">' + html + "</article>";
if (typeof filters !== "string") { if (typeof filters !== "string") {
return html; return html;
} }

63
static/js/kancloud.js
View File

@ -16,46 +16,31 @@ var events = function () {
} }
initHighlighting(); initHighlighting();
$(window).resize();
$(".manual-right").scrollTop(0); $(".manual-right").scrollTop(0);
//使用layer相册功能查看图片 //使用layer相册功能查看图片
layer.photos({photos: "#page-content"}); layer.photos({photos: "#page-content"});
}; };
if(window.sessionStorage){
return { return {
data: function ($key, $value) { data: function ($key, $value) {
$key = "MinDoc::Document:" + $key; $key = "MinDoc::Document:" + $key;
if(typeof $value === "undefined"){ if (typeof $value === "undefined") {
var data = window.sessionStorage.getItem($key); return $("body").data($key);
return JSON.parse(data); } else {
} else { return $('body').data($key, $value);
$value = JSON.stringify($value);
return window.sessionStorage.setItem($key,$value);
}
},
trigger: function ($e, $obj) {
articleOpen($e, $obj);
} }
} },
}else{ trigger: function ($e, $obj) {
return { if ($e === "article.open") {
data : function ($key, $value) { articleOpen($e, $obj);
$key = "MinDoc::Document:" + $key; } else {
if(typeof $value === "undefined"){ $('body').trigger('article.open', $obj);
return $("body").data($key);
}else{
return $('body').data($key, $value);
}
},
trigger: function ($e, $obj) {
if($e === "article.open"){
articleOpen($e, $obj);
}else {
$('body').trigger('article.open', $obj);
}
} }
} }
} }
}(); }();
/*** /***
@ -185,19 +170,19 @@ $(function () {
}catch (e) { }catch (e) {
console.log(e); console.log(e);
} }
}); }).on("click",".markdown-toc-list a", function () {
$(".markdown-toc-list li:eq(0)").addClass("directory-item-active"); var $this = $(this);
setTimeout(function () {
$(".markdown-toc-list li").removeClass("directory-item-active");
$this.parents("li").addClass("directory-item-active");
},10);
}).find(".markdown-toc-list li:eq(0)").addClass("directory-item-active");
$(".markdown-toc-list a").on("click",function () {
$(".markdown-toc-list li").removeClass("directory-item-active");
$(this).parents("li").addClass("directory-item-active");
});
$(window).resize(function (e) { $(window).resize(function (e) {
var h = $(".manual-catalog").innerHeight() - 20; var h = $(".manual-catalog").innerHeight() - 20;
$(".markdown-toc").height(h); $(".markdown-toc").height(h);
}); }).resize();
$(window).resize();
window.isFullScreen = false; window.isFullScreen = false;

60
utils/html.go
View File

@ -3,6 +3,9 @@ package utils
import ( import (
"regexp" "regexp"
"strings" "strings"
"github.com/PuerkitoBio/goquery"
"bytes"
"github.com/lifei6671/mindoc/conf"
) )
func StripTags(s string) string { func StripTags(s string) string {
@ -54,3 +57,60 @@ func AutoSummary(body string,l int) string {
} }
return content return content
} }
//安全处理HTML文档，过滤危险标签和属性.
func SafetyProcessor(html string) string {
//安全过滤，移除危险标签和属性
if docQuery, err := goquery.NewDocumentFromReader(bytes.NewBufferString(html)); err == nil {
docQuery.Find("script").Remove()
docQuery.Find("form").Remove()
docQuery.Find("link").Remove()
docQuery.Find("applet").Remove()
docQuery.Find("frame").Remove()
docQuery.Find("meta").Remove()
docQuery.Find("iframe").Remove()
docQuery.Find("*").Each(func(i int, selection *goquery.Selection) {
if href, ok := selection.Attr("href"); ok && strings.HasPrefix(href, "javascript:") {
selection.SetAttr("href", "#")
}
if src, ok := selection.Attr("src"); ok && strings.HasPrefix(src, "javascript:") {
selection.SetAttr("src", "#")
}
selection.RemoveAttr("onafterprint").
RemoveAttr("onbeforeprint").
RemoveAttr("onbeforeunload").
RemoveAttr("onload").
RemoveAttr("onclick").
RemoveAttr("onkeydown").
RemoveAttr("onkeypress").
RemoveAttr("onkeyup").
RemoveAttr("ondblclick").
RemoveAttr("onmousedown").
RemoveAttr("onmousemove").
RemoveAttr("onmouseout").
RemoveAttr("onmouseover").
RemoveAttr("onmouseup")
})
//处理外链
docQuery.Find("a").Each(func(i int, contentSelection *goquery.Selection) {
if src, ok := contentSelection.Attr("href"); ok {
if strings.HasPrefix(src, "http://") || strings.HasPrefix(src, "https://") {
if conf.BaseUrl != "" && !strings.HasPrefix(src, conf.BaseUrl) {
contentSelection.SetAttr("target", "_blank")
}
}
}
})
if html, err := docQuery.Html(); err == nil {
return strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(html), "<html><head></head><body>"), "</body></html>")
}
}
return html
}