lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-09-19 01:58:00 +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

34
models/Team.go
View File

@@ -4,8 +4,8 @@ import (
"errors"
"time"
"github.com/astaxie/beego"
"github.com/astaxie/beego/orm"
"github.com/astaxie/beego/logs"
"github.com/beego/beego/v2/adapter/orm"
"github.com/mindoc-org/mindoc/conf"
)
@@ -48,8 +48,8 @@ func (t *Team) First(id int, cols ...string) (*Team, error) {
err := o.QueryTable(t.TableNameWithPrefix()).Filter("team_id", id).One(t, cols...)
if err != nil {
beego.Error("查询团队失败 ->",id, err)
return nil,err
logs.Error("查询团队失败 ->", id, err)
return nil, err
}
t.Include()
return t, err
@@ -64,29 +64,29 @@ func (t *Team) Delete(id int) (err error) {
err = o.Begin()
if err != nil {
beego.Error("开启事物时出错 ->",err)
logs.Error("开启事物时出错 ->", err)
return
}
_,err = o.QueryTable(t.TableNameWithPrefix()).Filter("team_id",id).Delete()
_, err = o.QueryTable(t.TableNameWithPrefix()).Filter("team_id", id).Delete()
if err != nil {
beego.Error("删除团队时出错 ->", err)
logs.Error("删除团队时出错 ->", err)
o.Rollback()
return
}
_,err = o.Raw("delete from md_team_member where team_id=?;", id).Exec()
_, err = o.Raw("delete from md_team_member where team_id=?;", id).Exec()
if err != nil {
beego.Error("删除团队成员时出错 ->", err)
logs.Error("删除团队成员时出错 ->", err)
o.Rollback()
return
}
_,err = o.Raw("delete from md_team_relationship where team_id=?;",id).Exec()
_, err = o.Raw("delete from md_team_relationship where team_id=?;", id).Exec()
if err != nil {
beego.Error("删除团队项目时出错 ->", err)
logs.Error("删除团队项目时出错 ->", err)
o.Rollback()
return err
}
@@ -113,7 +113,7 @@ func (t *Team) FindToPager(pageIndex, pageSize int) (list []*Team, totalCount in
}
totalCount = int(c)
for _,item := range list {
for _, item := range list {
item.Include()
}
return
@@ -123,23 +123,23 @@ func (t *Team) Include() {
o := orm.NewOrm()
if member,err := NewMember().Find(t.MemberId,"account","real_name"); err == nil {
if member, err := NewMember().Find(t.MemberId, "account", "real_name"); err == nil {
if member.RealName != "" {
t.MemberName = member.RealName
} else {
t.MemberName = member.Account
}
}
if c,err := o.QueryTable(NewTeamRelationship().TableNameWithPrefix()).Filter("team_id", t.TeamId).Count(); err == nil {
if c, err := o.QueryTable(NewTeamRelationship().TableNameWithPrefix()).Filter("team_id", t.TeamId).Count(); err == nil {
t.BookCount = int(c)
}
if c,err := o.QueryTable(NewTeamMember().TableNameWithPrefix()).Filter("team_id", t.TeamId).Count(); err == nil {
if c, err := o.QueryTable(NewTeamMember().TableNameWithPrefix()).Filter("team_id", t.TeamId).Count(); err == nil {
t.MemberCount = int(c)
}
}
//更新或添加一个团队.
func (t *Team) Save(cols ... string) (err error) {
func (t *Team) Save(cols ...string) (err error) {
if t.TeamName == "" {
return NewError(5001, "团队名称不能为空")
}
@@ -155,7 +155,7 @@ func (t *Team) Save(cols ... string) (err error) {
_, err = o.Update(t, cols...)
}
if err != nil {
beego.Error("在保存团队时出错 ->", err)
logs.Error("在保存团队时出错 ->", err)
}
return
}