lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2026-02-27 17:03:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore!(all): attempt to update beego to v2

Browse Source 
BREAKING CHANGE: beego has update to v2, and this version of mindoc IS
NOT TESTED AND STABLE!!!
This commit is contained in:
roberChen
2021-03-23 21:55:50 +08:00
parent 79f70d830d
commit 90c1329de2
56 changed files with 1021 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
controllers/AccountController.go
View File

@@ -8,7 +8,7 @@ import (
"html/template"
"github.com/astaxie/beego"
"github.com/beego/beego/v2/adapter/logs"
"github.com/lifei6671/gocaptcha"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/mail"
@@ -124,7 +124,7 @@ func (c *AccountController) Login() {
c.JsonResult(0, "ok", c.referer())
} else {
beego.Error("用户登录 ->", err)
logs.Error("用户登录 ->", err)
c.JsonResult(500, "账号或密码错误", nil)
}
} else {
@@ -249,7 +249,7 @@ func (c *AccountController) FindPassword() {
count, err := models.NewMemberToken().FindSendCount(email, time.Now().Add(-1*time.Hour), time.Now())
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6008, "发送邮件失败")
}
if count > mailConf.MailNumber {
@@ -274,7 +274,7 @@ func (c *AccountController) FindPassword() {
body, err := c.ExecuteViewPathTemplate("account/mail_template.tpl", data)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6003, "邮件发送失败")
}
@@ -288,7 +288,7 @@ func (c *AccountController) FindPassword() {
Secure: mailConf.Secure,
Identity: "",
}
beego.Info(mailConfig)
logs.Info(mailConfig)
c := mail.NewSMTPClient(mailConfig)
m := mail.NewMail()
@@ -300,9 +300,9 @@ func (c *AccountController) FindPassword() {
m.AddTo(email)
if e := c.Send(m); e != nil {
beego.Error("发送邮件失败：" + e.Error())
logs.Error("发送邮件失败：" + e.Error())
} else {
beego.Info("邮件发送成功：" + email)
logs.Info("邮件发送成功：" + email)
}
//auth := smtp.PlainAuth(
// "",
@@ -322,7 +322,7 @@ func (c *AccountController) FindPassword() {
// []byte(subject+mime+"\n"+body),
//)
//if err != nil {
// beego.Error("邮件发送失败 => ", email, err)
// logs.Error("邮件发送失败 => ", email, err)
//}
}(mailConf, email, body)
@@ -336,12 +336,12 @@ func (c *AccountController) FindPassword() {
memberToken, err := models.NewMemberToken().FindByFieldFirst("token", token)
if err != nil {
beego.Error(err)
logs.Error(err)
c.Data["ErrorMessage"] = "邮件已失效"
c.TplName = "errors/error.tpl"
return
}
subTime := memberToken.SendTime.Sub(time.Now())
subTime := time.Until(memberToken.SendTime)
if !strings.EqualFold(memberToken.Email, email) || subTime.Minutes() > float64(mailConf.MailExpired) || !memberToken.ValidTime.IsZero() {
c.Data["ErrorMessage"] = "验证码已过期，请重新操作。"
@@ -388,10 +388,10 @@ func (c *AccountController) ValidEmail() {
memberToken, err := models.NewMemberToken().FindByFieldFirst("token", token)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6007, "邮件已失效")
}
subTime := memberToken.SendTime.Sub(time.Now())
subTime := time.Until(memberToken.SendTime)
if !strings.EqualFold(memberToken.Email, email) || subTime.Minutes() > float64(mailConf.MailExpired) || !memberToken.ValidTime.IsZero() {
@@ -399,13 +399,13 @@ func (c *AccountController) ValidEmail() {
}
member, err := models.NewMember().Find(memberToken.MemberId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6005, "用户不存在")
}
hash, err := utils.PasswordHash(password1)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6006, "保存密码失败")
}
@@ -417,7 +417,7 @@ func (c *AccountController) ValidEmail() {
memberToken.InsertOrUpdate()
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6006, "保存密码失败")
}
c.JsonResult(0, "ok", conf.URLFor("AccountController.Login"))
@@ -441,7 +441,7 @@ func (c *AccountController) Captcha() {
captchaImage := gocaptcha.NewCaptchaImage(140, 40, gocaptcha.RandLightColor())
//if err != nil {
// beego.Error(err)
// logs.Error(err)
// c.Abort("500")
//}

30
controllers/BaseController.go
View File

@@ -12,14 +12,16 @@ import (
"io/ioutil"
"path/filepath"
"github.com/astaxie/beego"
"github.com/beego/beego/v2/adapter"
"github.com/beego/beego/v2/adapter/logs"
"github.com/beego/beego/v2/server/web"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils"
)
type BaseController struct {
beego.Controller
web.Controller
Member *models.Member
Option map[string]string
EnableAnonymous bool
@@ -73,15 +75,16 @@ func (c *BaseController) Prepare() {
c.EnableAnonymous = strings.EqualFold(c.Option["ENABLE_ANONYMOUS"], "true")
c.EnableDocumentHistory = strings.EqualFold(c.Option["ENABLE_DOCUMENT_HISTORY"], "true")
}
c.Data["HighlightStyle"] = beego.AppConfig.DefaultString("highlight_style", "github")
c.Data["HighlightStyle"] = adapter.AppConfig.DefaultString("highlight_style", "github")
if b, err := ioutil.ReadFile(filepath.Join(beego.BConfig.WebConfig.ViewsPath, "widgets", "scripts.tpl")); err == nil {
if b, err := ioutil.ReadFile(filepath.Join(web.BConfig.WebConfig.ViewsPath, "widgets", "scripts.tpl")); err == nil {
c.Data["Scripts"] = template.HTML(string(b))
}
}
//判断用户是否登录.
func (c *BaseController)isUserLoggedIn() bool {
func (c *BaseController) isUserLoggedIn() bool {
return c.Member != nil && c.Member.MemberId > 0
}
@@ -112,7 +115,7 @@ func (c *BaseController) JsonResult(errCode int, errMsg string, data ...interfac
returnJSON, err := json.Marshal(jsonData)
if err != nil {
beego.Error(err)
logs.Error(err)
}
c.Ctx.ResponseWriter.Header().Set("Content-Type", "application/json; charset=utf-8")
@@ -123,7 +126,7 @@ func (c *BaseController) JsonResult(errCode int, errMsg string, data ...interfac
}
//如果错误不为空，则响应错误信息到浏览器.
func (c *BaseController) CheckJsonError(code int,err error) {
func (c *BaseController) CheckJsonError(code int, err error) {
if err == nil {
return
@@ -136,7 +139,7 @@ func (c *BaseController) CheckJsonError(code int,err error) {
returnJSON, err := json.Marshal(jsonData)
if err != nil {
beego.Error(err)
logs.Error(err)
}
c.Ctx.ResponseWriter.Header().Set("Content-Type", "application/json; charset=utf-8")
@@ -153,18 +156,18 @@ func (c *BaseController) ExecuteViewPathTemplate(tplName string, data interface{
viewPath := c.ViewPath
if c.ViewPath == "" {
viewPath = beego.BConfig.WebConfig.ViewsPath
viewPath = web.BConfig.WebConfig.ViewsPath
}
if err := beego.ExecuteViewPathTemplate(&buf, tplName, viewPath, data); err != nil {
if err := adapter.ExecuteViewPathTemplate(&buf, tplName, viewPath, data); err != nil {
return "", err
}
return buf.String(), nil
}
func (c *BaseController) BaseUrl() string {
baseUrl := beego.AppConfig.DefaultString("baseurl", "")
baseUrl := adapter.AppConfig.DefaultString("baseurl", "")
if baseUrl != "" {
if strings.HasSuffix(baseUrl, "/") {
baseUrl = strings.TrimSuffix(baseUrl, "/")
@@ -184,7 +187,7 @@ func (c *BaseController) ShowErrorPage(errCode int, errMsg string) {
var buf bytes.Buffer
if err := beego.ExecuteViewPathTemplate(&buf, "errors/error.tpl", beego.BConfig.WebConfig.ViewsPath, map[string]interface{}{"ErrorMessage": errMsg, "ErrorCode": errCode, "BaseUrl": conf.BaseUrl}); err != nil {
if err := adapter.ExecuteViewPathTemplate(&buf, "errors/error.tpl", web.BConfig.WebConfig.ViewsPath, map[string]interface{}{"ErrorMessage": errMsg, "ErrorCode": errCode, "BaseUrl": conf.BaseUrl}); err != nil {
c.Abort("500")
}
if errCode >= 200 && errCode <= 510 {
@@ -194,8 +197,7 @@ func (c *BaseController) ShowErrorPage(errCode int, errMsg string) {
}
}
func (c *BaseController) CheckErrorResult(code int,err error) {
func (c *BaseController) CheckErrorResult(code int, err error) {
if err != nil {
c.ShowErrorPage(code, err.Error())
}

7
controllers/BlogController.go
View File

@@ -1,6 +1,7 @@
package controllers
import (
"context"
"encoding/json"
"fmt"
"html/template"
@@ -54,11 +55,11 @@ func (c *BlogController) Index() {
c.JsonResult(6001, "文章密码不正确")
} else if blog.BlogStatus == "password" && password == blog.Password {
//如果密码输入正确，则存入session中
_ = c.CruSession.Set(blogReadSession, blogId)
_ = c.CruSession.Set( context.TODO(),blogReadSession, blogId)
c.JsonResult(0, "OK")
}
c.JsonResult(0, "OK")
} else if blog.BlogStatus == "password" && (c.CruSession.Get(blogReadSession) == nil || (c.Member != nil && blog.MemberId != c.Member.MemberId && !c.Member.IsAdministrator())) {
} else if blog.BlogStatus == "password" && (c.CruSession.Get(context.TODO(), blogReadSession) == nil || (c.Member != nil && blog.MemberId != c.Member.MemberId && !c.Member.IsAdministrator())) {
//如果不存在已输入密码的标记
c.TplName = "blog/index_password.tpl"
}
@@ -628,7 +629,7 @@ func (c *BlogController) Download() {
}
blogReadSession := fmt.Sprintf("blog:read:%d", blogId)
//如果没有启动匿名访问，或者设置了访问密码
if (c.Member == nil && !c.EnableAnonymous) || (blog.BlogStatus == "password" && password != blog.Password && c.CruSession.Get(blogReadSession) == nil) {
if (c.Member == nil && !c.EnableAnonymous) || (blog.BlogStatus == "password" && password != blog.Password && c.CruSession.Get(context.TODO(), blogReadSession) == nil) {
c.ShowErrorPage(403, "没有下载权限")
}

46
controllers/BookController.go
View File

@@ -1,6 +1,7 @@
package controllers
import (
"context"
"encoding/json"
"errors"
"fmt"
@@ -16,9 +17,8 @@ import (
"net/http"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/adapter/logs"
"github.com/beego/beego/v2/adapter/orm"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/graphics"
"github.com/mindoc-org/mindoc/models"
@@ -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)
}
@@ -534,10 +534,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")
@@ -562,7 +562,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)
}
@@ -614,7 +614,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)
@@ -643,7 +643,7 @@ func (c *BookController) Import() {
go book.ImportBook(tempPath)
beego.Info("用户[", c.Member.Account, "]导入了项目 ->", book)
logs.Info("用户[", c.Member.Account, "]导入了项目 ->", book)
c.JsonResult(0, "项目正在后台转换中，请稍后查看")
}
@@ -680,7 +680,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 = ""
@@ -688,7 +688,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", "")
// }
//}
@@ -716,7 +716,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")
}
@@ -731,7 +731,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
}
@@ -746,7 +746,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 {
@@ -772,14 +772,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")
}
@@ -796,7 +796,7 @@ func (c *BookController) SaveSort() {
err := json.Unmarshal(content, &docs)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6003, "数据错误")
}
@@ -804,7 +804,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 {
@@ -813,12 +813,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 {
@@ -830,7 +830,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)

10
controllers/BookMemberController.go
View File

@@ -3,9 +3,8 @@ package controllers
import (
"errors"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/adapter/logs"
"github.com/beego/beego/v2/adapter/orm"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
)
@@ -17,9 +16,9 @@ type BookMemberController struct {
// AddMember 参加参与用户.
func (c *BookMemberController) AddMember() {
identify := c.GetString("identify")
account,_ := c.GetInt("account")
account, _ := c.GetInt("account")
roleId, _ := c.GetInt("role_id", 3)
beego.Info(account)
logs.Info(account)
if identify == "" || account <= 0 {
c.JsonResult(6001, "参数错误")
}
@@ -29,7 +28,6 @@ func (c *BookMemberController) AddMember() {
c.JsonResult(6001, err.Error())
}
member := models.NewMember()
if _, err := member.Find(account); err != nil {

119
controllers/DocumentController.go
View File

@@ -1,6 +1,7 @@
package controllers
import (
"context"
"encoding/json"
"fmt"
"html/template"
@@ -14,9 +15,9 @@ import (
"strings"
"time"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/adapter"
"github.com/beego/beego/v2/adapter/orm"
"github.com/boombuler/barcode"
"github.com/boombuler/barcode/qr"
"github.com/mindoc-org/mindoc/conf"
@@ -77,7 +78,7 @@ func (c *DocumentController) Index() {
if err == orm.ErrNoRows {
c.ShowErrorPage(404, "当前项目没有文档")
} else {
beego.Error("生成项目文档树时出错 -> ", err)
logs.Error("生成项目文档树时出错 -> ", err)
c.ShowErrorPage(500, "生成项目文档树时出错")
}
}
@@ -115,7 +116,7 @@ func (c *DocumentController) Read() {
if docId, err := strconv.Atoi(id); err == nil {
doc, err = doc.FromCacheById(docId)
if err != nil || doc == nil {
beego.Error("从缓存中读取文档时失败 ->", err)
logs.Error("从缓存中读取文档时失败 ->", err)
c.ShowErrorPage(404, "文档不存在或已删除")
return
}
@@ -125,7 +126,7 @@ func (c *DocumentController) Read() {
if err == orm.ErrNoRows {
c.ShowErrorPage(404, "文档不存在或已删除")
} else {
beego.Error("从缓存查询文档时出错 ->", err)
logs.Error("从缓存查询文档时出错 ->", err)
c.ShowErrorPage(500, "未知异常")
}
return
@@ -161,7 +162,7 @@ func (c *DocumentController) Read() {
tree, err := models.NewDocument().CreateDocumentTreeForHtml(bookResult.BookId, doc.DocumentId)
if err != nil && err != orm.ErrNoRows {
beego.Error("生成项目文档树时出错 ->", err)
logs.Error("生成项目文档树时出错 ->", err)
c.ShowErrorPage(500, "生成项目文档树时出错")
}
@@ -201,7 +202,7 @@ func (c *DocumentController) Edit() {
if err == orm.ErrNoRows || err == models.ErrPermissionDenied {
c.ShowErrorPage(403, "项目不存在或没有权限")
} else {
beego.Error("查询项目时出错 -> ", err)
logs.Error("查询项目时出错 -> ", err)
c.ShowErrorPage(500, "查询项目时出错")
}
return
@@ -231,7 +232,7 @@ func (c *DocumentController) Edit() {
trees, err := models.NewDocument().FindDocumentTree(bookResult.BookId)
if err != nil {
beego.Error("FindDocumentTree => ", err)
logs.Error("FindDocumentTree => ", err)
} else {
if len(trees) > 0 {
if jtree, err := json.Marshal(trees); err == nil {
@@ -242,12 +243,12 @@ func (c *DocumentController) Edit() {
}
}
c.Data["BaiDuMapKey"] = beego.AppConfig.DefaultString("baidumapkey", "")
c.Data["BaiDuMapKey"] = adapter.AppConfig.DefaultString("baidumapkey", "")
if conf.GetUploadFileSize() > 0 {
c.Data["UploadFileSize"] = conf.GetUploadFileSize()
} else {
c.Data["UploadFileSize"] = "undefined";
c.Data["UploadFileSize"] = "undefined"
}
}
@@ -274,7 +275,7 @@ func (c *DocumentController) Create() {
if c.Member.IsAdministrator() {
book, err := models.NewBook().FindByFieldFirst("identify", identify)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6002, "项目不存在或权限不足")
}
@@ -283,7 +284,7 @@ func (c *DocumentController) Create() {
bookResult, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil || bookResult.RoleId == conf.BookObserver {
beego.Error("FindByIdentify => ", err)
logs.Error("FindByIdentify => ", err)
c.JsonResult(6002, "项目不存在或权限不足")
}
@@ -327,7 +328,7 @@ func (c *DocumentController) Create() {
}
if err := document.InsertOrUpdate(); err != nil {
beego.Error("添加或更新文档时出错 -> ", err)
logs.Error("添加或更新文档时出错 -> ", err)
c.JsonResult(6005, "保存失败")
} else {
c.JsonResult(0, "ok", document)
@@ -395,7 +396,7 @@ func (c *DocumentController) Upload() {
book, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil {
beego.Error("DocumentController.Edit => ", err)
logs.Error("DocumentController.Edit => ", err)
if err == orm.ErrNoRows {
c.JsonResult(6006, "权限不足")
}
@@ -439,7 +440,7 @@ func (c *DocumentController) Upload() {
err = c.SaveToFile(name, filePath)
if err != nil {
beego.Error("保存文件失败 -> ", err)
logs.Error("保存文件失败 -> ", err)
c.JsonResult(6005, "保存文件失败")
}
@@ -472,7 +473,7 @@ func (c *DocumentController) Upload() {
if err != nil {
os.Remove(filePath)
beego.Error("文件保存失败 ->", err)
logs.Error("文件保存失败 ->", err)
c.JsonResult(6006, "文件保存失败")
}
@@ -480,7 +481,7 @@ func (c *DocumentController) Upload() {
attachment.HttpPath = conf.URLForNotHost("DocumentController.DownloadAttachment", ":key", identify, ":attach_id", attachment.AttachmentId)
if err := attachment.Update(); err != nil {
beego.Error("保存文件失败 ->", err)
logs.Error("保存文件失败 ->", err)
c.JsonResult(6005, "保存文件失败")
}
}
@@ -525,7 +526,7 @@ func (c *DocumentController) DownloadAttachment() {
if err == orm.ErrNoRows {
c.ShowErrorPage(404, "项目不存在或已删除")
} else {
beego.Error("查找项目时出错 ->", err)
logs.Error("查找项目时出错 ->", err)
c.ShowErrorPage(500, "系统错误")
}
}
@@ -547,7 +548,7 @@ func (c *DocumentController) DownloadAttachment() {
attachment, err := models.NewAttachment().Find(attachId)
if err != nil {
beego.Error("查找附件时出错 -> ", err)
logs.Error("查找附件时出错 -> ", err)
if err == orm.ErrNoRows {
c.ShowErrorPage(404, "附件不存在或已删除")
} else {
@@ -575,21 +576,21 @@ func (c *DocumentController) RemoveAttachment() {
attach, err := models.NewAttachment().Find(attachId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6002, "附件不存在")
}
document, err := models.NewDocument().Find(attach.DocumentId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6003, "文档不存在")
}
if c.Member.Role != conf.MemberSuperRole {
rel, err := models.NewRelationship().FindByBookIdAndMemberId(document.BookId, c.Member.MemberId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6004, "权限不足")
}
@@ -600,7 +601,7 @@ func (c *DocumentController) RemoveAttachment() {
err = attach.Delete()
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6005, "删除失败")
}
@@ -622,7 +623,7 @@ func (c *DocumentController) Delete() {
if c.Member.IsAdministrator() {
book, err := models.NewBook().FindByFieldFirst("identify", identify)
if err != nil {
beego.Error("FindByIdentify => ", err)
logs.Error("FindByIdentify => ", err)
c.JsonResult(6002, "项目不存在或权限不足")
}
@@ -631,7 +632,7 @@ func (c *DocumentController) Delete() {
bookResult, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil || bookResult.RoleId == conf.BookObserver {
beego.Error("FindByIdentify => ", err)
logs.Error("FindByIdentify => ", err)
c.JsonResult(6002, "项目不存在或权限不足")
}
@@ -645,7 +646,7 @@ func (c *DocumentController) Delete() {
doc, err := models.NewDocument().Find(docId)
if err != nil {
beego.Error("Delete => ", err)
logs.Error("Delete => ", err)
c.JsonResult(6003, "删除失败")
}
// 如果文档所属项目错误
@@ -692,7 +693,7 @@ func (c *DocumentController) Content() {
bookResult, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil || bookResult.RoleId == conf.BookObserver {
beego.Error("项目不存在或权限不足 -> ", err)
logs.Error("项目不存在或权限不足 -> ", err)
c.JsonResult(6002, "项目不存在或权限不足")
}
@@ -722,7 +723,7 @@ func (c *DocumentController) Content() {
}
if doc.Version != version && !strings.EqualFold(isCover, "yes") {
beego.Info("%d|", version, doc.Version)
logs.Info("%d|", version, doc.Version)
c.JsonResult(6005, "文档已被修改确定要覆盖吗？")
}
@@ -749,7 +750,7 @@ func (c *DocumentController) Content() {
doc.ModifyAt = c.Member.MemberId
if err := doc.InsertOrUpdate(); err != nil {
beego.Error("InsertOrUpdate => ", err)
logs.Error("InsertOrUpdate => ", err)
c.JsonResult(6006, "保存失败")
}
@@ -759,7 +760,7 @@ func (c *DocumentController) Content() {
if c.EnableDocumentHistory && cryptil.Md5Crypt(history.Markdown) != cryptil.Md5Crypt(doc.Markdown) {
_, err = history.InsertOrUpdate()
if err != nil {
beego.Error("DocumentHistory InsertOrUpdate => ", err)
logs.Error("DocumentHistory InsertOrUpdate => ", err)
}
}
}(history)
@@ -819,7 +820,7 @@ func (c *DocumentController) Export() {
if err == orm.ErrNoRows {
c.ShowErrorPage(404, "项目不存在")
} else {
beego.Error("查找项目时出错 ->", err)
logs.Error("查找项目时出错 ->", err)
c.ShowErrorPage(500, "查找项目时出错")
}
}
@@ -839,7 +840,7 @@ func (c *DocumentController) Export() {
if bookResult.Editor != "markdown" {
c.ShowErrorPage(500, "当前项目不支持Markdown编辑器")
}
p, err := bookResult.ExportMarkdown(c.CruSession.SessionID())
p, err := bookResult.ExportMarkdown(c.CruSession.SessionID(context.TODO()))
if err != nil {
c.ShowErrorPage(500, "导出文档失败")
@@ -874,7 +875,7 @@ func (c *DocumentController) Export() {
c.Abort("200")
} else if output == "pdf" || output == "epub" || output == "docx" || output == "mobi" {
if err := models.BackgroundConvert(c.CruSession.SessionID(), bookResult); err != nil && err != gopool.ErrHandlerIsExist {
if err := models.BackgroundConvert(c.CruSession.SessionID(context.TODO()), bookResult); err != nil && err != gopool.ErrHandlerIsExist {
c.ShowErrorPage(500, "导出失败，请查看系统日志")
}
@@ -900,13 +901,13 @@ func (c *DocumentController) QrCode() {
uri := conf.URLFor("DocumentController.Index", ":key", identify)
code, err := qr.Encode(uri, qr.L, qr.Unicode)
if err != nil {
beego.Error("生成二维码失败 ->", err)
logs.Error("生成二维码失败 ->", err)
c.ShowErrorPage(500, "生成二维码失败")
}
code, err = barcode.Scale(code, 150, 150)
if err != nil {
beego.Error("生成二维码失败 ->", err)
logs.Error("生成二维码失败 ->", err)
c.ShowErrorPage(500, "生成二维码失败")
}
@@ -916,7 +917,7 @@ func (c *DocumentController) QrCode() {
err = png.Encode(c.Ctx.ResponseWriter, code)
if err != nil {
beego.Error("生成二维码失败 ->", err)
logs.Error("生成二维码失败 ->", err)
c.ShowErrorPage(500, "生成二维码失败")
}
}
@@ -942,7 +943,7 @@ func (c *DocumentController) Search() {
docs, err := models.NewDocumentSearchResult().SearchDocument(keyword, bookResult.BookId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6002, "搜索结果错误")
}
@@ -976,7 +977,7 @@ func (c *DocumentController) History() {
if c.Member.IsAdministrator() {
book, err := models.NewBook().FindByFieldFirst("identify", identify)
if err != nil {
beego.Error("查找项目失败 ->", err)
logs.Error("查找项目失败 ->", err)
c.Data["ErrorMessage"] = "项目不存在或权限不足"
return
}
@@ -986,7 +987,7 @@ func (c *DocumentController) History() {
} else {
bookResult, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil || bookResult.RoleId == conf.BookObserver {
beego.Error("查找项目失败 ->", err)
logs.Error("查找项目失败 ->", err)
c.Data["ErrorMessage"] = "项目不存在或权限不足"
return
}
@@ -1002,7 +1003,7 @@ func (c *DocumentController) History() {
doc, err := models.NewDocument().Find(docId)
if err != nil {
beego.Error("Delete => ", err)
logs.Error("Delete => ", err)
c.Data["ErrorMessage"] = "获取历史失败"
return
}
@@ -1015,7 +1016,7 @@ func (c *DocumentController) History() {
histories, totalCount, err := models.NewDocumentHistory().FindToPager(docId, pageIndex, conf.PageSize)
if err != nil {
beego.Error("分页查找文档历史失败 ->", err)
logs.Error("分页查找文档历史失败 ->", err)
c.Data["ErrorMessage"] = "获取历史失败"
return
}
@@ -1049,7 +1050,7 @@ func (c *DocumentController) DeleteHistory() {
if c.Member.IsAdministrator() {
book, err := models.NewBook().FindByFieldFirst("identify", identify)
if err != nil {
beego.Error("查找项目失败 ->", err)
logs.Error("查找项目失败 ->", err)
c.JsonResult(6002, "项目不存在或权限不足")
}
@@ -1057,7 +1058,7 @@ func (c *DocumentController) DeleteHistory() {
} else {
bookResult, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil || bookResult.RoleId == conf.BookObserver {
beego.Error("查找项目失败 ->", err)
logs.Error("查找项目失败 ->", err)
c.JsonResult(6002, "项目不存在或权限不足")
}
@@ -1070,7 +1071,7 @@ func (c *DocumentController) DeleteHistory() {
doc, err := models.NewDocument().Find(docId)
if err != nil {
beego.Error("Delete => ", err)
logs.Error("Delete => ", err)
c.JsonResult(6001, "获取历史失败")
}
@@ -1081,7 +1082,7 @@ func (c *DocumentController) DeleteHistory() {
err = models.NewDocumentHistory().Delete(historyId, docId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6002, "删除失败")
}
@@ -1107,7 +1108,7 @@ func (c *DocumentController) RestoreHistory() {
if c.Member.IsAdministrator() {
book, err := models.NewBook().FindByFieldFirst("identify", identify)
if err != nil {
beego.Error("FindByIdentify => ", err)
logs.Error("FindByIdentify => ", err)
c.JsonResult(6002, "项目不存在或权限不足")
}
@@ -1115,7 +1116,7 @@ func (c *DocumentController) RestoreHistory() {
} else {
bookResult, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil || bookResult.RoleId == conf.BookObserver {
beego.Error("FindByIdentify => ", err)
logs.Error("FindByIdentify => ", err)
c.JsonResult(6002, "项目不存在或权限不足")
}
@@ -1128,7 +1129,7 @@ func (c *DocumentController) RestoreHistory() {
doc, err := models.NewDocument().Find(docId)
if err != nil {
beego.Error("Delete => ", err)
logs.Error("Delete => ", err)
c.JsonResult(6001, "获取历史失败")
}
@@ -1139,7 +1140,7 @@ func (c *DocumentController) RestoreHistory() {
err = models.NewDocumentHistory().Restore(historyId, docId, c.Member.MemberId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6002, "删除失败")
}
@@ -1161,7 +1162,7 @@ func (c *DocumentController) Compare() {
if c.Member.IsAdministrator() {
book, err := models.NewBook().FindByFieldFirst("identify", identify)
if err != nil {
beego.Error("DocumentController.Compare => ", err)
logs.Error("DocumentController.Compare => ", err)
c.ShowErrorPage(403, "权限不足")
return
}
@@ -1172,7 +1173,7 @@ func (c *DocumentController) Compare() {
} else {
bookResult, err := models.NewBookResult().FindByIdentify(identify, c.Member.MemberId)
if err != nil || bookResult.RoleId == conf.BookObserver {
beego.Error("FindByIdentify => ", err)
logs.Error("FindByIdentify => ", err)
c.ShowErrorPage(403, "权限不足")
return
}
@@ -1188,7 +1189,7 @@ func (c *DocumentController) Compare() {
history, err := models.NewDocumentHistory().Find(historyId)
if err != nil {
beego.Error("DocumentController.Compare => ", err)
logs.Error("DocumentController.Compare => ", err)
c.ShowErrorPage(60003, err.Error())
}
@@ -1215,7 +1216,7 @@ func (c *DocumentController) isReadable(identify, token string) *models.BookResu
book, err := models.NewBook().FindByFieldFirst("identify", identify)
if err != nil {
beego.Error(err)
logs.Error(err)
c.ShowErrorPage(500, "项目不存在")
}
bookResult := models.NewBookResult().ToBookResult(*book)
@@ -1240,7 +1241,7 @@ func (c *DocumentController) isReadable(identify, token string) *models.BookResu
if token != "" && strings.EqualFold(token, book.PrivateToken) {
c.SetSession(identify, token)
} else if token, ok := c.GetSession(identify).(string); !ok || !strings.EqualFold(token, book.PrivateToken) {
beego.Info("尝试访问文档但权限不足 ->", identify, token)
logs.Info("尝试访问文档但权限不足 ->", identify, token)
c.ShowErrorPage(403, "权限不足")
}
} else if password := c.GetString("bPassword", ""); !isOk && book.BookPassword != "" && password != "" {
@@ -1258,14 +1259,14 @@ func (c *DocumentController) isReadable(identify, token string) *models.BookResu
if book.BookPassword != "" {
//判断已存在的密码是否正确
if password, ok := c.GetSession(identify).(string); !ok || !strings.EqualFold(password, book.BookPassword) {
body, err := c.ExecuteViewPathTemplate("document/document_password.tpl", map[string]string{"Identify": book.Identify});
body, err := c.ExecuteViewPathTemplate("document/document_password.tpl", map[string]string{"Identify": book.Identify})
if err != nil {
beego.Error("显示密码页面失败 ->", err)
logs.Error("显示密码页面失败 ->", err)
}
c.CustomAbort(200, body)
}
} else {
beego.Info("尝试访问文档但权限不足 ->", identify, token)
logs.Info("尝试访问文档但权限不足 ->", identify, token)
c.ShowErrorPage(403, "权限不足")
}
}
@@ -1276,8 +1277,8 @@ func (c *DocumentController) isReadable(identify, token string) *models.BookResu
}
func promptUserToLogIn(c *DocumentController) {
beego.Info("Access " + c.Ctx.Request.URL.RequestURI() + " not permitted.")
beego.Info(" Access will be redirected to login page(SessionId: " + c.CruSession.SessionID() + ").")
logs.Info("Access " + c.Ctx.Request.URL.RequestURI() + " not permitted.")
logs.Info(" Access will be redirected to login page(SessionId: " + c.CruSession.SessionID(context.TODO()) + ").")
if c.IsAjax() {
c.JsonResult(6000, "请重新登录。")

4
controllers/HomeController.go
View File

@@ -4,7 +4,7 @@ import (
"math"
"net/url"
"github.com/astaxie/beego"
"github.com/beego/beego/v2/adapter/logs"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils/pagination"
@@ -37,7 +37,7 @@ func (c *HomeController) Index() {
books, totalCount, err := models.NewBook().FindForHomeToPager(pageIndex, pageSize, memberId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.Abort("500")
}
if totalCount > 0 {

7
controllers/ItemsetsController.go
View File

@@ -1,8 +1,8 @@
package controllers
import (
"github.com/astaxie/beego"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/adapter/logs"
"github.com/beego/beego/v2/adapter/orm"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils/pagination"
@@ -11,6 +11,7 @@ import (
type ItemsetsController struct {
BaseController
}
func (c *ItemsetsController) Prepare() {
c.BaseController.Prepare()
@@ -65,7 +66,7 @@ func (c *ItemsetsController) List() {
if err == orm.ErrNoRows {
c.Abort("404")
} else {
beego.Error(err)
logs.Error(err)
c.Abort("500")
}
}

8
controllers/LabelController.go
View File

@@ -3,8 +3,8 @@ package controllers
import (
"math"
"github.com/astaxie/beego"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/adapter/logs"
"github.com/beego/beego/v2/adapter/orm"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils/pagination"
@@ -40,7 +40,7 @@ func (c *LabelController) Index() {
if err == orm.ErrNoRows {
c.Abort("404")
} else {
beego.Error(err)
logs.Error(err)
c.Abort("500")
}
}
@@ -51,7 +51,7 @@ func (c *LabelController) Index() {
searchResult, totalCount, err := models.NewBook().FindForLabelToPager(labelName, pageIndex, conf.PageSize, memberId)
if err != nil && err != orm.ErrNoRows {
beego.Error("查询标签时出错 ->", err)
logs.Error("查询标签时出错 ->", err)
c.ShowErrorPage(500, "查询文档列表时出错")
}
if totalCount > 0 {

45
controllers/ManagerController.go
View File

@@ -13,9 +13,9 @@ import (
"io/ioutil"
"os"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/adapter"
"github.com/beego/beego/v2/adapter/logs"
"github.com/beego/beego/v2/adapter/orm"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils"
@@ -210,7 +210,7 @@ func (c *ManagerController) EditMember() {
member, err := models.NewMember().Find(member_id)
if err != nil {
beego.Error(err)
logs.Error(err)
c.Abort("404")
}
if c.Ctx.Input.IsPost() {
@@ -235,7 +235,7 @@ func (c *ManagerController) EditMember() {
if password1 != "" {
password, err := utils.PasswordHash(password1)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6003, "对用户密码加密时出错")
}
member.Password = password
@@ -261,7 +261,7 @@ func (c *ManagerController) DeleteMember() {
member, err := models.NewMember().Find(member_id)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(500, "用户不存在")
}
if member.Role == conf.MemberSuperRole {
@@ -270,14 +270,14 @@ func (c *ManagerController) DeleteMember() {
superMember, err := models.NewMember().FindByFieldFirst("role", 0)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(5001, "未能找到超级管理员")
}
err = models.NewMember().Delete(member_id, superMember.MemberId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(5002, "删除失败")
}
c.JsonResult(0, "ok")
@@ -341,7 +341,7 @@ func (c *ManagerController) EditBook() {
autoRelease := strings.TrimSpace(c.GetString("auto_release")) == "on"
publisher := strings.TrimSpace(c.GetString("publisher"))
historyCount, _ := c.GetInt("history_count", 0)
itemId,_ := c.GetInt("itemId")
itemId, _ := c.GetInt("itemId")
if strings.Count(description, "") > 500 {
c.JsonResult(6004, "项目描述不能大于500字")
@@ -356,7 +356,7 @@ func (c *ManagerController) EditBook() {
}
}
if !models.NewItemsets().Exist(itemId) {
c.JsonResult(6006,"项目空间不存在")
c.JsonResult(6006, "项目空间不存在")
}
book.Publisher = publisher
book.HistoryCount = historyCount
@@ -517,7 +517,7 @@ func (c *ManagerController) Transfer() {
rel, err := models.NewRelationship().FindFounder(book.BookId)
if err != nil {
beego.Error("FindFounder => ", err)
logs.Error("FindFounder => ", err)
c.JsonResult(6009, "查询项目创始人失败")
}
if member.MemberId == rel.MemberId {
@@ -647,7 +647,7 @@ func (c *ManagerController) AttachDetailed() {
attach, err := models.NewAttachmentResult().Find(attach_id)
if err != nil {
beego.Error("AttachDetailed => ", err)
logs.Error("AttachDetailed => ", err)
if err == orm.ErrNoRows {
c.Abort("404")
} else {
@@ -674,13 +674,13 @@ func (c *ManagerController) AttachDelete() {
attach, err := models.NewAttachment().Find(attachId)
if err != nil {
beego.Error("AttachDelete => ", err)
logs.Error("AttachDelete => ", err)
c.JsonResult(6001, err.Error())
}
attach.FilePath = filepath.Join(conf.WorkingDirectory, attach.FilePath)
if err := attach.Delete(); err != nil {
beego.Error("AttachDelete => ", err)
logs.Error("AttachDelete => ", err)
c.JsonResult(6002, err.Error())
}
c.JsonResult(0, "ok")
@@ -714,7 +714,7 @@ func (c *ManagerController) LabelDelete() {
labelId, err := strconv.Atoi(c.Ctx.Input.Param(":id"))
if err != nil {
beego.Error("获取删除标签参数时出错:", err)
logs.Error("获取删除标签参数时出错:", err)
c.JsonResult(50001, "参数错误")
}
if labelId <= 0 {
@@ -723,7 +723,7 @@ func (c *ManagerController) LabelDelete() {
label, err := models.NewLabel().FindFirst("label_id", labelId)
if err != nil {
beego.Error("查询标签时出错:", err)
logs.Error("查询标签时出错:", err)
c.JsonResult(50001, "查询标签时出错:"+err.Error())
}
if err := label.Delete(); err != nil {
@@ -744,22 +744,22 @@ func (c *ManagerController) Config() {
tf, err := ioutil.TempFile(os.TempDir(), "mindoc")
if err != nil {
beego.Error("创建临时文件失败 ->", err)
logs.Error("创建临时文件失败 ->", err)
c.JsonResult(5001, "创建临时文件失败")
}
defer tf.Close()
tf.WriteString(content)
err = beego.LoadAppConfig("ini", tf.Name())
err = adapter.LoadAppConfig("ini", tf.Name())
if err != nil {
beego.Error("加载配置文件失败 ->", err)
logs.Error("加载配置文件失败 ->", err)
c.JsonResult(5002, "加载配置文件失败")
}
err = filetil.CopyFile(tf.Name(), conf.ConfigurationFile)
if err != nil {
beego.Error("保存配置文件失败 ->", err)
logs.Error("保存配置文件失败 ->", err)
c.JsonResult(5003, "保存配置文件失败")
}
c.JsonResult(0, "保存成功")
@@ -903,7 +903,7 @@ func (c *ManagerController) TeamMemberList() {
b, err := json.Marshal(teams)
if err != nil {
beego.Error("编码 JSON 结果失败 ->", err)
logs.Error("编码 JSON 结果失败 ->", err)
c.Data["Result"] = template.JS("[]")
} else {
c.Data["Result"] = template.JS(string(b))
@@ -1030,7 +1030,7 @@ func (c *ManagerController) TeamBookList() {
b, err := json.Marshal(teams)
if err != nil {
beego.Error("编码 JSON 结果失败 ->", err)
logs.Error("编码 JSON 结果失败 ->", err)
c.Data["Result"] = template.JS("[]")
} else {
c.Data["Result"] = template.JS(string(b))
@@ -1124,7 +1124,6 @@ func (c *ManagerController) Itemsets() {
c.Data["Lists"] = items
}
//编辑或添加项目空间.

12
controllers/SearchController.go
View File

@@ -4,7 +4,7 @@ import (
"strconv"
"strings"
"github.com/astaxie/beego"
"github.com/beego/beego/v2/adapter/logs"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils"
@@ -41,20 +41,20 @@ func (c *SearchController) Index() {
searchResult, totalCount, err := models.NewDocumentSearchResult().FindToPager(sqltil.EscapeLike(keyword), pageIndex, conf.PageSize, memberId)
if err != nil {
beego.Error("搜索失败 ->",err)
logs.Error("搜索失败 ->", err)
return
}
if totalCount > 0 {
pager := pagination.NewPagination(c.Ctx.Request, totalCount, conf.PageSize,c.BaseUrl())
pager := pagination.NewPagination(c.Ctx.Request, totalCount, conf.PageSize, c.BaseUrl())
c.Data["PageHtml"] = pager.HtmlPages()
} else {
c.Data["PageHtml"] = ""
}
if len(searchResult) > 0 {
keywords := strings.Split(keyword," ")
keywords := strings.Split(keyword, " ")
for _, item := range searchResult {
for _,word := range keywords {
for _, word := range keywords {
item.DocumentName = strings.Replace(item.DocumentName, word, "<em>"+word+"</em>", -1)
if item.Description != "" {
src := item.Description
@@ -102,7 +102,7 @@ func (c *SearchController) User() {
//members, err := models.NewMemberRelationshipResult().FindNotJoinUsersByAccount(book.BookId, 10, "%"+keyword+"%")
members, err := models.NewMemberRelationshipResult().FindNotJoinUsersByAccountOrRealName(book.BookId, 10, "%"+keyword+"%")
if err != nil {
beego.Error("查询用户列表出错：" + err.Error())
logs.Error("查询用户列表出错：" + err.Error())
c.JsonResult(500, err.Error())
}
result := models.SelectMemberResult{}

2
controllers/SettingController.go
View File

@@ -8,7 +8,7 @@ import (
"strings"
"time"
"github.com/astaxie/beego/logs"
"github.com/beego/beego/v2/adapter/logs"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/graphics"
"github.com/mindoc-org/mindoc/models"

95
controllers/TemplateController.go
View File

@@ -4,7 +4,7 @@ import (
"errors"
"strings"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/adapter/orm"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
)
@@ -14,7 +14,7 @@ type TemplateController struct {
BookId int
}
func (c *TemplateController) isPermission() (error) {
func (c *TemplateController) isPermission() error {
c.Prepare()
bookIdentify := c.GetString("identify", "")
@@ -44,39 +44,40 @@ func (c *TemplateController) isPermission() (error) {
}
return nil
}
//获取指定模板信息
func (c *TemplateController) Get() {
if err := c.isPermission() ; err != nil {
c.JsonResult(500,err.Error())
if err := c.isPermission(); err != nil {
c.JsonResult(500, err.Error())
}
templateId, _ := c.GetInt("template_id",0)
templateId, _ := c.GetInt("template_id", 0)
template,err := models.NewTemplate().Find(templateId)
template, err := models.NewTemplate().Find(templateId)
if err != nil {
c.JsonResult(500,"读取模板失败")
c.JsonResult(500, "读取模板失败")
}
if template.IsGlobal == 0 && template.BookId != c.BookId {
c.JsonResult(404,"模板不存在或已删除")
c.JsonResult(404, "模板不存在或已删除")
}
c.JsonResult(0,"OK",template)
c.JsonResult(0, "OK", template)
}
//获取模板列表
func (c *TemplateController) List() {
c.TplName = "template/list.tpl"
if err := c.isPermission() ; err != nil {
if err := c.isPermission(); err != nil {
c.Data["ErrorMessage"] = err.Error()
return
}
templateList,err := models.NewTemplate().FindAllByBookId(c.BookId)
templateList, err := models.NewTemplate().FindAllByBookId(c.BookId)
if err != nil && err != orm.ErrNoRows{
if err != nil && err != orm.ErrNoRows {
c.Data["ErrorMessage"] = "查询项目模板失败"
}
if templateList != nil {
for i,t := range templateList {
for i, t := range templateList {
templateList[i] = t.Preload()
}
}
@@ -86,32 +87,30 @@ func (c *TemplateController) List() {
//添加模板
func (c *TemplateController) Add() {
if err := c.isPermission() ; err != nil {
c.JsonResult(500,err.Error())
if err := c.isPermission(); err != nil {
c.JsonResult(500, err.Error())
}
templateId, _ := c.GetInt("template_id",0)
templateId, _ := c.GetInt("template_id", 0)
content := c.GetString("content")
isGlobal,_ := c.GetInt("is_global",0)
templateName := c.GetString("template_name","")
isGlobal, _ := c.GetInt("is_global", 0)
templateName := c.GetString("template_name", "")
if templateName == "" || strings.Count(templateName,"") > 300 {
c.JsonResult(500,"模板名称不能为空且必须小于300字")
if templateName == "" || strings.Count(templateName, "") > 300 {
c.JsonResult(500, "模板名称不能为空且必须小于300字")
}
template := models.NewTemplate()
if templateId > 0 {
t,err := template.Find(templateId);
t, err := template.Find(templateId)
if err != nil {
c.JsonResult(500,"模板不存在")
c.JsonResult(500, "模板不存在")
}
template = t
template.ModifyAt = c.Member.MemberId
}
template.TemplateId = templateId
template.BookId = c.BookId
template.TemplateContent = content
@@ -120,16 +119,16 @@ func (c *TemplateController) Add() {
//只有管理员才能设置全局模板
if c.Member.IsAdministrator() {
template.IsGlobal = isGlobal
}else{
} else {
template.IsGlobal = 0
//如果不是管理员需要判断是否有项目权限
rel,err := models.NewRelationship().FindByBookIdAndMemberId(c.BookId,c.Member.MemberId)
rel, err := models.NewRelationship().FindByBookIdAndMemberId(c.BookId, c.Member.MemberId)
if err != nil || rel.RoleId == conf.BookObserver {
c.JsonResult(403,"没有权限")
c.JsonResult(403, "没有权限")
}
//如果修改的模板不是本人创建的，并且又不是项目创建者则禁止修改
if template.MemberId > 0 && template.MemberId != c.Member.MemberId && rel.RoleId != conf.BookFounder {
c.JsonResult(403,"没有权限")
c.JsonResult(403, "没有权限")
}
}
template.MemberId = c.Member.MemberId
@@ -137,51 +136,51 @@ func (c *TemplateController) Add() {
var cols []string
if templateId > 0 {
cols = []string{ "template_content", "modify_time","modify_at","version" }
cols = []string{"template_content", "modify_time", "modify_at", "version"}
}
if err := template.Save(cols...); err != nil {
c.JsonResult(500,"报错模板失败")
c.JsonResult(500, "报错模板失败")
}
c.JsonResult(0,"OK",template)
c.JsonResult(0, "OK", template)
}
//删除模板
func (c *TemplateController) Delete() {
if err := c.isPermission() ; err != nil {
c.JsonResult(500,err.Error())
if err := c.isPermission(); err != nil {
c.JsonResult(500, err.Error())
}
templateId, _ := c.GetInt("template_id",0)
templateId, _ := c.GetInt("template_id", 0)
template,err := models.NewTemplate().Find(templateId)
template, err := models.NewTemplate().Find(templateId)
if err != nil {
c.JsonResult(404,"模板不存在")
c.JsonResult(404, "模板不存在")
}
if c.Member.IsAdministrator() {
err := models.NewTemplate().Delete(templateId,0)
err := models.NewTemplate().Delete(templateId, 0)
if err != nil {
c.JsonResult(500,"删除失败")
c.JsonResult(500, "删除失败")
}
}else{
} else {
//如果不是管理员需要判断是否有项目权限
rel,err := models.NewRelationship().FindByBookIdAndMemberId(template.BookId,c.Member.MemberId)
rel, err := models.NewRelationship().FindByBookIdAndMemberId(template.BookId, c.Member.MemberId)
if err != nil || rel.RoleId == conf.BookObserver {
c.JsonResult(403,"没有权限")
c.JsonResult(403, "没有权限")
}
//如果是创始人或管理者可以直接删除模板
if rel.RoleId == conf.BookFounder || rel.RoleId == conf.BookAdmin {
err := models.NewTemplate().Delete(templateId,0)
if rel.RoleId == conf.BookFounder || rel.RoleId == conf.BookAdmin {
err := models.NewTemplate().Delete(templateId, 0)
if err != nil {
c.JsonResult(500,"删除失败")
c.JsonResult(500, "删除失败")
}
}
if err := models.NewTemplate().Delete(templateId,c.Member.MemberId);err != nil {
c.JsonResult(500,"删除失败")
if err := models.NewTemplate().Delete(templateId, c.Member.MemberId); err != nil {
c.JsonResult(500, "删除失败")
}
}
c.JsonResult(0,"OK")
}
c.JsonResult(0, "OK")
}