合并dev

Author: TruthHun88

commands/command.go

@@ -99,6 +99,7 @@ func RegisterModel() {
 		models.NewSign(),
 		models.NewBookCounter(),
 		models.NewDownloadCounter(),
+		models.NewEbook(),
 	)
 	migrate.RegisterMigration()
 }
@@ -192,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)
 	})

commands/install.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/TruthHun/BookStack/conf"
 	"github.com/TruthHun/BookStack/models"
+	"github.com/TruthHun/BookStack/utils"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/orm"
 )
@@ -25,9 +26,31 @@ func Install() {
 		os.Exit(1)
 	}
 	initSeo()
+	resetCategoryUniqueIndex()
+	migrateEbook()
 	fmt.Println("Install Successfully!")
 	os.Exit(0)
+}
 
+// 删除分类中的title的唯一索引（兼容旧版本）
+func resetCategoryUniqueIndex() {
+	var indexs []struct {
+		Table      string `orm:"column(Table)"`
+		NonUnique  int    `orm:"column(Non_unique)"`
+		KeyName    string `orm:"column(Key_name)"`
+		ColumnName string `orm:"column(Column_name)"`
+	}
+	showIndex := "SHOW INDEX FROM md_category"
+	dropIndex := "ALTER TABLE `md_category` DROP INDEX `%s`;"
+	addUniqueIndex := "ALTER TABLE `md_category` ADD UNIQUE( `pid`, `title`);"
+	o := orm.NewOrm()
+	o.Raw(showIndex).QueryRows(&indexs)
+	for _, index := range indexs {
+		if index.ColumnName == "title" {
+			o.Raw(fmt.Sprintf(dropIndex, index.KeyName)).Exec()
+		}
+	}
+	o.Raw(addUniqueIndex).Exec()
 }
 
 func Version() {
@@ -133,3 +156,43 @@ func initSeo() {
 		orm.NewOrm().Update(&item, "statement")
 	}
 }
+
+// 电子书数据迁移
+func migrateEbook() {
+	// 1. 查找 md_ebook 表中不存在的书籍的电子书
+	var (
+		books    []models.Book
+		sqlQuery = "SELECT book_id,generate_time,book_name,identify,label,description FROM `md_books` WHERE `generate_time`>'2010' and book_id not in (select book_id from md_ebook where book_id>0 group by book_id)"
+	)
+	o := orm.NewOrm()
+	o.Raw(sqlQuery).QueryRows(&books)
+	if len(books) == 0 {
+		beego.Info("不存在需要同步的电子书数据")
+		return
+	}
+	exts := []string{".pdf", ".epub", ".mobi"}
+	for _, book := range books {
+		beego.Info("迁移书籍电子书：", book.BookName)
+		var ebooks []models.Ebook
+		bookPrefix := fmt.Sprintf("/projects/%v/books/%v", book.Identify, book.GenerateTime.Unix())
+		if utils.StoreType == utils.StoreLocal {
+			bookPrefix = "/uploads" + bookPrefix
+		}
+		ebook := models.Ebook{
+			Title:       book.BookName,
+			Keywords:    book.Label,
+			Description: beego.Substr(book.Description, 0, 255),
+			BookID:      book.BookId,
+			Status:      models.EBookStatusSuccess,
+		}
+		for _, ext := range exts {
+			ebook.Ext = ext
+			ebook.Path = bookPrefix + ext
+			ebooks = append(ebooks, ebook)
+		}
+		if _, err := o.InsertMulti(len(ebooks), &ebooks); err != nil {
+			beego.Error(err)
+		}
+	}
+	beego.Info("电子书数据同步中...")
+}

controllers/BaseController.go

@@ -150,6 +150,10 @@ func (this *BaseController) Prepare() {
 		this.Data["CloseSubmitEnter"] = v == "true"
 	}
 
+	if v, ok := this.Option["WIDESCREEN"]; ok {
+		this.Data["IsWideScreen"] = v == "true"
+	}
+
 	this.Data["SiteName"] = this.Sitename
 
 	// 默认显示创建书籍的入口
@@ -212,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