lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-24 10:11:32 +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

30
models/TeamMember.go
View File

@@ -3,8 +3,8 @@ package models
import (
"errors"
"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"
)
@@ -55,7 +55,7 @@ func (m *TeamMember) First(id int, cols ...string) (*TeamMember, error) {
err := o.QueryTable(m.TableNameWithPrefix()).Filter("team_member_id", id).One(m, cols...)
if err != nil && err != orm.ErrNoRows {
beego.Error("查询团队成员错误 ->", err)
logs.Error("查询团队成员错误 ->", err)
}
return m.Include(), err
@@ -71,7 +71,7 @@ func (m *TeamMember) ChangeRoleId(teamId int, memberId int, roleId conf.BookRole
err = o.QueryTable(m.TableNameWithPrefix()).Filter("team_id", teamId).Filter("member_id", memberId).OrderBy("-team_member_id").One(m)
if err != nil {
beego.Error("查询团队用户时失败 ->", err)
logs.Error("查询团队用户时失败 ->", err)
return m, err
}
m.RoleId = roleId
@@ -93,7 +93,7 @@ func (m *TeamMember) FindFirst(teamId, memberId int) (*TeamMember, error) {
err := o.QueryTable(m.TableNameWithPrefix()).Filter("team_id", teamId).Filter("member_id", memberId).One(m)
if err != nil {
beego.Error("查询团队用户失败 ->", err)
logs.Error("查询团队用户失败 ->", err)
return nil, err
}
return m.Include(), nil
@@ -127,7 +127,7 @@ func (m *TeamMember) Save(cols ...string) (err error) {
_, err = o.Update(m, cols...)
}
if err != nil {
beego.Error("在保存团队时出错 ->", err)
logs.Error("在保存团队时出错 ->", err)
}
return
}
@@ -141,7 +141,7 @@ func (m *TeamMember) Delete(id int) (err error) {
_, err = orm.NewOrm().QueryTable(m.TableNameWithPrefix()).Filter("team_member_id", id).Delete()
if err != nil {
beego.Error("删除团队用户时出错 ->", err)
logs.Error("删除团队用户时出错 ->", err)
}
return
}
@@ -160,7 +160,7 @@ func (m *TeamMember) FindToPager(teamId, pageIndex, pageSize int) (list []*TeamM
if err != nil {
if err != orm.ErrNoRows {
beego.Error("查询团队成员失败 ->", err)
logs.Error("查询团队成员失败 ->", err)
}
return
}
@@ -217,7 +217,7 @@ limit ?;`
_, err := o.Raw(sql, teamId, "%"+account+"%", limit).QueryRows(&members)
if err != nil {
beego.Error("查询团队用户时出错 ->", err)
logs.Error("查询团队用户时出错 ->", err)
return nil, err
}
@@ -235,9 +235,9 @@ limit ?;`
return &result, err
}
func (m *TeamMember) FindByBookIdAndMemberId(bookId,memberId int) (*TeamMember, error) {
func (m *TeamMember) FindByBookIdAndMemberId(bookId, memberId int) (*TeamMember, error) {
if bookId <= 0 || memberId <= 0 {
return nil,ErrInvalidParameter
return nil, ErrInvalidParameter
}
//一个用户可能在多个团队中，且一个项目可能有多个团队参与。因此需要查询用户最大权限。
sql := `select *
@@ -247,11 +247,11 @@ and team.member_id = ? order by team.role_id asc limit 1;`
o := orm.NewOrm()
err := o.Raw(sql,bookId,memberId).QueryRow(m)
err := o.Raw(sql, bookId, memberId).QueryRow(m)
if err != nil {
beego.Error("查询用户项目所在团队失败 ->bookId=",bookId," memberId=", memberId, err)
return nil,err
logs.Error("查询用户项目所在团队失败 ->bookId=", bookId, " memberId=", memberId, err)
return nil, err
}
return m,nil
return m, nil
}