diff --git a/commands/command.go b/commands/command.go index 63a01a2a..b22396c7 100644 --- a/commands/command.go +++ b/commands/command.go @@ -143,6 +143,11 @@ func RegisterModel() { gob.Register(models.Document{}) gob.Register(models.Template{}) //migrate.RegisterMigration() + err := orm.RunSyncdb("default", false, true) + if err != nil { + logs.Error("注册Model失败 ->", err) + os.Exit(1) + } } // RegisterLogger 注册日志 diff --git a/controllers/BookController.go b/controllers/BookController.go index 095e82fb..b9387778 100644 --- a/controllers/BookController.go +++ b/controllers/BookController.go @@ -122,6 +122,7 @@ func (c *BookController) Setting() { if book.PrivateToken != "" { book.PrivateToken = conf.URLFor("DocumentController.Index", ":key", book.Identify, "token", book.PrivateToken) } + fmt.Println("book.PrintState", book.PrintState) c.Data["Model"] = book } @@ -153,6 +154,7 @@ func (c *BookController) SaveBook() { isUseFirstDocument := strings.TrimSpace(c.GetString("is_use_first_document")) == "on" autoSave := strings.TrimSpace(c.GetString("auto_save")) == "on" itemId, _ := c.GetInt("itemId") + pringState := strings.TrimSpace(c.GetString("print_state")) == "on" if strings.Count(description, "") > 500 { c.JsonResult(6004, i18n.Tr(c.Lang, "message.project_desc_tips")) @@ -211,6 +213,11 @@ func (c *BookController) SaveBook() { } else { book.AutoSave = 0 } + if pringState { + book.PrintSate = 1 + } else { + book.PrintSate = 0 + } if err := book.Update(); err != nil { c.JsonResult(6006, i18n.Tr(c.Lang, "message.failed")) } diff --git a/models/BookModel.go b/models/BookModel.go index d46d2ff5..cfe7cfbc 100644 --- a/models/BookModel.go +++ b/models/BookModel.go @@ -82,7 +82,8 @@ type Book struct { //是否使用第一篇文章项目为默认首页,0 否/1 是 IsUseFirstDocument int `orm:"column(is_use_first_document);type(int);default(0);description(是否使用第一篇文章项目为默认首页,0 否/1 是)" json:"is_use_first_document"` //是否开启自动保存:0 否/1 是 - AutoSave int `orm:"column(auto_save);type(tinyint);default(0);description(是否开启自动保存:0 否/1 是)" json:"auto_save"` + AutoSave int `orm:"column(auto_save);type(tinyint);default(0);description(是否开启自动保存:0 否/1 是)" json:"auto_save"` + PrintSate int `orm:"column(print_state);type(tinyint);default(1);description(启用打印:0 否/1 是)" json:"print_state"` } func (book *Book) String() string { diff --git a/models/BookResult.go b/models/BookResult.go index 0ea535bc..de2ada58 100644 --- a/models/BookResult.go +++ b/models/BookResult.go @@ -71,6 +71,7 @@ type BookResult struct { IsDisplayComment bool `json:"is_display_comment"` IsDownload bool `json:"is_download"` AutoSave bool `json:"auto_save"` + PrintState bool `json:"print_state"` Lang string } @@ -213,6 +214,7 @@ func (m *BookResult) ToBookResult(book Book) *BookResult { m.HistoryCount = book.HistoryCount m.IsDownload = book.IsDownload == 0 m.AutoSave = book.AutoSave == 1 + m.PrintState = book.PrintSate == 1 m.ItemId = book.ItemId m.RoleId = conf.BookRoleNoSpecific