lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-12-21 19:29:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
wangbin8909
2021-04-11 17:19:54 +08:00
parent 27dea7b8bd ededbbe713
commit b21035bbfd
62 changed files with 1226 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
controllers/BookController.go
View File

@@ -1,6 +1,7 @@
package controllers
import (
"context"
"encoding/json"
"errors"
"fmt"
@@ -16,15 +17,14 @@ import (
"net/http"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/client/orm"
"github.com/beego/beego/v2/core/logs"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/graphics"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils"
"github.com/mindoc-org/mindoc/utils/pagination"
"gopkg.in/russross/blackfriday.v2"
"github.com/russross/blackfriday/v2"
)
type BookController struct {
@@ -210,7 +210,7 @@ func (c *BookController) SaveBook() {
bookResult.Description = description
bookResult.CommentStatus = commentStatus
beego.Info("用户 [", c.Member.Account, "] 修改了项目 ->", book)
logs.Info("用户 [", c.Member.Account, "] 修改了项目 ->", book)
c.JsonResult(0, "ok", bookResult)
}
@@ -255,7 +255,7 @@ func (c *BookController) PrivatelyOwned() {
logs.Error("PrivatelyOwned => ", err)
c.JsonResult(6004, "保存失败")
}
beego.Info("用户 【", c.Member.Account, "]修改了项目权限 ->", state)
logs.Info("用户 【", c.Member.Account, "]修改了项目权限 ->", state)
c.JsonResult(0, "ok")
}
@@ -390,7 +390,7 @@ func (c *BookController) UploadCover() {
if oldCover != conf.GetDefaultCover() {
os.Remove("." + oldCover)
}
beego.Info("用户[", c.Member.Account, "]上传了项目封面 ->", book.BookName, book.BookId, book.Cover)
logs.Info("用户[", c.Member.Account, "]上传了项目封面 ->", book.BookName, book.BookId, book.Cover)
c.JsonResult(0, "ok", url)
}
@@ -533,10 +533,10 @@ func (c *BookController) Create() {
bookResult, err := models.NewBookResult().FindByIdentify(book.Identify, c.Member.MemberId)
if err != nil {
beego.Error(err)
logs.Error(err)
}
beego.Info("用户[", c.Member.Account, "]创建了项目 ->", book)
logs.Info("用户[", c.Member.Account, "]创建了项目 ->", book)
c.JsonResult(0, "ok", bookResult)
}
c.JsonResult(6001, "error")
@@ -561,7 +561,7 @@ func (c *BookController) Copy() {
} else {
bookResult, err := models.NewBookResult().FindByIdentify(book.Identify, c.Member.MemberId)
if err != nil {
beego.Error("查询失败")
logs.Error("查询失败")
}
c.JsonResult(0, "ok", bookResult)
}
@@ -613,7 +613,7 @@ func (c *BookController) Import() {
c.JsonResult(6006, "项目标识已存在")
}
tempPath := filepath.Join(os.TempDir(), c.CruSession.SessionID())
tempPath := filepath.Join(os.TempDir(), c.CruSession.SessionID(context.TODO()))
os.MkdirAll(tempPath, 0766)
@@ -641,7 +641,7 @@ func (c *BookController) Import() {
go book.ImportBook(tempPath)
beego.Info("用户[", c.Member.Account, "]导入了项目 ->", book)
logs.Info("用户[", c.Member.Account, "]导入了项目 ->", book)
c.JsonResult(0, "项目正在后台转换中，请稍后查看")
}
@@ -678,7 +678,7 @@ func (c *BookController) Import() {
// logs.Error("生成阅读令牌失败 => ", err)
// c.JsonResult(6003, "生成阅读令牌失败")
// }
// beego.Info("用户[", c.Member.Account, "]创建项目令牌 ->", book.PrivateToken)
// logs.Info("用户[", c.Member.Account, "]创建项目令牌 ->", book.PrivateToken)
// c.JsonResult(0, "ok", conf.URLFor("DocumentController.Index", ":key", book.Identify, "token", book.PrivateToken))
// } else {
// book.PrivateToken = ""
@@ -686,7 +686,7 @@ func (c *BookController) Import() {
// logs.Error("CreateToken => ", err)
// c.JsonResult(6004, "删除令牌失败")
// }
// beego.Info("用户[", c.Member.Account, "]创建项目令牌 ->", book.PrivateToken)
// logs.Info("用户[", c.Member.Account, "]创建项目令牌 ->", book.PrivateToken)
// c.JsonResult(0, "ok", "")
// }
//}
@@ -714,7 +714,7 @@ func (c *BookController) Delete() {
logs.Error("删除项目 => ", err)
c.JsonResult(6003, "删除失败")
}
beego.Info("用户[", c.Member.Account, "]删除了项目 ->", bookResult)
logs.Info("用户[", c.Member.Account, "]删除了项目 ->", bookResult)
c.JsonResult(0, "ok")
}
@@ -729,7 +729,7 @@ func (c *BookController) Release() {
if c.Member.IsAdministrator() {
book, err := models.NewBook().FindByFieldFirst("identify", identify)
if err != nil {
beego.Error("发布文档失败 ->", err)
logs.Error("发布文档失败 ->", err)
c.JsonResult(6003, "文档不存在")
return
}
@@ -744,7 +744,7 @@ func (c *BookController) Release() {
if err == orm.ErrNoRows {
c.JsonResult(6002, "项目不存在")
}
beego.Error(err)
logs.Error(err)
c.JsonResult(6003, "未知错误")
}
if book.RoleId != conf.BookAdmin && book.RoleId != conf.BookFounder && book.RoleId != conf.BookEditor {
@@ -770,14 +770,14 @@ func (c *BookController) SaveSort() {
if c.Member.IsAdministrator() {
book, err := models.NewBook().FindByFieldFirst("identify", identify)
if err != nil || book == nil {
c.JsonResult(6001,"项目不存在")
c.JsonResult(6001, "项目不存在")
return
}
bookId = book.BookId
} else {
bookResult, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil {
beego.Error("DocumentController.Edit => ", err)
logs.Error("DocumentController.Edit => ", err)
c.Abort("403")
}
@@ -794,7 +794,7 @@ func (c *BookController) SaveSort() {
err := json.Unmarshal(content, &docs)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6003, "数据错误")
}
@@ -802,7 +802,7 @@ func (c *BookController) SaveSort() {
if docId, ok := item["id"].(float64); ok {
doc, err := models.NewDocument().Find(int(docId))
if err != nil {
beego.Error(err)
logs.Error(err)
continue
}
if doc.BookId != bookId {
@@ -811,12 +811,12 @@ func (c *BookController) SaveSort() {
}
sort, ok := item["sort"].(float64)
if !ok {
beego.Info("排序数字转换失败 => ", item)
logs.Info("排序数字转换失败 => ", item)
continue
}
parentId, ok := item["parent"].(float64)
if !ok {
beego.Info("父分类转换失败 => ", item)
logs.Info("父分类转换失败 => ", item)
continue
}
if parentId > 0 {
@@ -828,7 +828,7 @@ func (c *BookController) SaveSort() {
doc.ParentId = int(parentId)
if err := doc.InsertOrUpdate(); err != nil {
fmt.Printf("%s", err.Error())
beego.Error(err)
logs.Error(err)
}
} else {
fmt.Printf("文档ID转换失败 => %+v", item)