diff --git a/commands/command.go b/commands/command.go index 5596f3cf..08593ad0 100644 --- a/commands/command.go +++ b/commands/command.go @@ -16,11 +16,11 @@ import ( "net/http" "github.com/beego/beego/v2/adapter" - "github.com/beego/beego/v2/adapter/orm" beegoCache "github.com/beego/beego/v2/client/cache" _ "github.com/beego/beego/v2/client/cache/memcache" "github.com/beego/beego/v2/client/cache/redis" _ "github.com/beego/beego/v2/client/cache/redis" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/server/web" "github.com/howeyc/fsnotify" diff --git a/commands/migrate/migrate_v03.go b/commands/migrate/migrate_v03.go index 95a2c5f1..39f8d472 100644 --- a/commands/migrate/migrate_v03.go +++ b/commands/migrate/migrate_v03.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/models" ) diff --git a/controllers/BlogController.go b/controllers/BlogController.go index b26c2e20..5ff07b05 100644 --- a/controllers/BlogController.go +++ b/controllers/BlogController.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/server/web" "github.com/mindoc-org/mindoc/conf" diff --git a/controllers/BookController.go b/controllers/BookController.go index 7408da1a..a30fce4b 100644 --- a/controllers/BookController.go +++ b/controllers/BookController.go @@ -18,7 +18,7 @@ import ( "net/http" "github.com/beego/beego/v2/adapter/logs" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/graphics" "github.com/mindoc-org/mindoc/models" diff --git a/controllers/BookMemberController.go b/controllers/BookMemberController.go index bacf58ce..e30012d8 100644 --- a/controllers/BookMemberController.go +++ b/controllers/BookMemberController.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/beego/beego/v2/adapter/logs" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" ) diff --git a/controllers/DocumentController.go b/controllers/DocumentController.go index b70aaa28..be0cee38 100644 --- a/controllers/DocumentController.go +++ b/controllers/DocumentController.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/server/web" "github.com/boombuler/barcode" diff --git a/controllers/ItemsetsController.go b/controllers/ItemsetsController.go index 4d60b277..eda28b05 100644 --- a/controllers/ItemsetsController.go +++ b/controllers/ItemsetsController.go @@ -2,7 +2,7 @@ package controllers import ( "github.com/beego/beego/v2/adapter/logs" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/utils/pagination" diff --git a/controllers/LabelController.go b/controllers/LabelController.go index 6ee3330a..e954dd3a 100644 --- a/controllers/LabelController.go +++ b/controllers/LabelController.go @@ -4,7 +4,7 @@ import ( "math" "github.com/beego/beego/v2/adapter/logs" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/utils/pagination" diff --git a/controllers/ManagerController.go b/controllers/ManagerController.go index ef70bc3e..360c6b8c 100644 --- a/controllers/ManagerController.go +++ b/controllers/ManagerController.go @@ -15,7 +15,7 @@ import ( "github.com/beego/beego/v2/adapter" "github.com/beego/beego/v2/adapter/logs" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/utils" diff --git a/controllers/TemplateController.go b/controllers/TemplateController.go index b02d1a9b..4348a1c0 100644 --- a/controllers/TemplateController.go +++ b/controllers/TemplateController.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/models" ) diff --git a/database/mindoc.db b/database/mindoc.db new file mode 100644 index 00000000..cd6c770f Binary files /dev/null and b/database/mindoc.db differ diff --git a/models/AttachmentModel.go b/models/AttachmentModel.go index d13b75c4..8df9d3ae 100644 --- a/models/AttachmentModel.go +++ b/models/AttachmentModel.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/beego/beego/v2/adapter/logs" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/utils/filetil" ) diff --git a/models/AttachmentResult.go b/models/AttachmentResult.go index 96504bf1..69f7c744 100644 --- a/models/AttachmentResult.go +++ b/models/AttachmentResult.go @@ -3,7 +3,7 @@ package models import ( "strings" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/utils/filetil" ) diff --git a/models/Blog.go b/models/Blog.go index 5f0da5ac..7e8e5d19 100644 --- a/models/Blog.go +++ b/models/Blog.go @@ -7,7 +7,7 @@ import ( "time" "github.com/PuerkitoBio/goquery" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/server/web" "github.com/mindoc-org/mindoc/cache" @@ -273,7 +273,7 @@ func (b *Blog) Processor() *Blog { } }) //设置图片为CDN地址 - if cdnimg,_ := web.AppConfig.String("cdnimg"); cdnimg != "" { + if cdnimg, _ := web.AppConfig.String("cdnimg"); cdnimg != "" { content.Find("img").Each(func(i int, contentSelection *goquery.Selection) { if src, ok := contentSelection.Attr("src"); ok && strings.HasPrefix(src, "/uploads/") { contentSelection.SetAttr("src", utils.JoinURI(cdnimg, src)) diff --git a/models/BookModel.go b/models/BookModel.go index ce93d0eb..8e558df5 100644 --- a/models/BookModel.go +++ b/models/BookModel.go @@ -1,6 +1,7 @@ package models import ( + "context" "crypto/md5" "errors" "fmt" @@ -17,7 +18,7 @@ import ( "encoding/json" "github.com/beego/beego/v2/adapter/logs" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/utils" "github.com/mindoc-org/mindoc/utils/cryptil" @@ -196,7 +197,7 @@ func (book *Book) Copy(identify string) error { logs.Error("查询项目时出错 -> ", err) return err } - if err := o.Begin(); err != nil { + if _, err := o.Begin(); err != nil { logs.Error("开启事物时出错 -> ", err) return err } @@ -209,49 +210,87 @@ func (book *Book) Copy(identify string) error { book.CommentCount = 0 book.HistoryCount = 0 - if _, err := o.Insert(book); err != nil { - logs.Error("复制项目时出错 -> ", err) - o.Rollback() + /* v2 version of beego remove the o.Rollback api for transaction operation. + * typically, in v1, you can write code like this: + * + * o := orm.NewOrm() + * if err := o.Operateion(); err != nil { + * o.Rollback() + * ... + * } + * + * however, in v2, this is not available. beego will handles the transaction in new way using + * cluster. the new code is like below: + * + * o := orm.NewOrm() + * if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error{ + * err := o.Operations() + * if err != nil { + * return err + * } + * ... + * }); err != nil { + * ... + * } + * + * when operation failed, it will automatically calls o.Rollback() for TxOrmer. + * more details see https://beego.me/docs/mvc/model/transaction.md + */ + if err := o.DoTx(func(ctx context.Context, txo orm.TxOrmer) error { + _, err := txo.Insert(book) + return err + + }); err != nil { + logs.Error("复制项目时出错： %s", err) return err } + var rels []*Relationship - if _, err := o.QueryTable(NewRelationship().TableNameWithPrefix()).Filter("book_id", bookId).All(&rels); err != nil { + if err := o.DoTx(func(ctx context.Context, txo orm.TxOrmer) error { + _, err := txo.QueryTable(NewRelationship().TableNameWithPrefix()).Filter("book_id", bookId).All(&rels) + return err + }); err != nil { logs.Error("复制项目关系时出错 -> ", err) - o.Rollback() return err } for _, rel := range rels { rel.BookId = book.BookId rel.RelationshipId = 0 - if _, err := o.Insert(rel); err != nil { + if err := o.DoTx(func(ctx context.Context, txo orm.TxOrmer) error { + _, err := txo.Insert(rel) + return err + }); err != nil { logs.Error("复制项目关系时出错 -> ", err) - o.Rollback() return err } } var docs []*Document - if _, err := o.QueryTable(NewDocument().TableNameWithPrefix()).Filter("book_id", bookId).Filter("parent_id", 0).All(&docs); err != nil && err != orm.ErrNoRows { + if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error { + _, err := txOrm.QueryTable(NewDocument().TableNameWithPrefix()).Filter("book_id", bookId).Filter("parent_id", 0).All(&docs) + return err + }); err != nil && err != orm.ErrNoRows { logs.Error("读取项目文档时出错 -> ", err) - o.Rollback() return err } + if len(docs) > 0 { - if err := recursiveInsertDocument(docs, o, book.BookId, 0); err != nil { + if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error { + return recursiveInsertDocument(docs, txOrm, book.BookId, 0) + }); err != nil { logs.Error("复制项目时出错 -> ", err) - o.Rollback() return err } } - return o.Commit() + return nil } //递归的复制文档 -func recursiveInsertDocument(docs []*Document, o orm.Ormer, bookId int, parentId int) error { +func recursiveInsertDocument(docs []*Document, o orm.TxOrmer, bookId int, parentId int) error { for _, doc := range docs { docId := doc.DocumentId @@ -418,42 +457,49 @@ func (book *Book) ThoroughDeleteBook(id int) error { o.Begin() //删除附件,这里没有删除实际物理文件 - _, err = o.Raw("DELETE FROM "+NewAttachment().TableNameWithPrefix()+" WHERE book_id=?", book.BookId).Exec() - if err != nil { - o.Rollback() + if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error { + _, err = txOrm.Raw("DELETE FROM "+NewAttachment().TableNameWithPrefix()+" WHERE book_id=?", book.BookId).Exec() + return err + }); err != nil { return err } //删除文档 - _, err = o.Raw("DELETE FROM "+NewDocument().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec() - - if err != nil { - o.Rollback() + if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error { + _, err = txOrm.Raw("DELETE FROM "+NewDocument().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec() + return err + }); err != nil { return err } //删除项目 - _, err = o.Raw("DELETE FROM "+book.TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec() - - if err != nil { - o.Rollback() + if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error { + _, err = txOrm.Raw("DELETE FROM "+book.TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec() + return err + }); err != nil { return err } //删除关系 - _, err = o.Raw("DELETE FROM "+NewRelationship().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec() - if err != nil { - o.Rollback() + + if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error { + _, err = txOrm.Raw("DELETE FROM "+NewRelationship().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec() + return err + }); err != nil { return err } - _, err = o.Raw(fmt.Sprintf("DELETE FROM %s WHERE book_id=?", NewTeamRelationship().TableNameWithPrefix()), book.BookId).Exec() - if err != nil { - o.Rollback() + + if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error { + _, err = txOrm.Raw(fmt.Sprintf("DELETE FROM %s WHERE book_id=?", NewTeamRelationship().TableNameWithPrefix()), book.BookId).Exec() + return err + }); err != nil { return err } //删除模板 - _, err = o.Raw("DELETE FROM "+NewTemplate().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec() - if err != nil { - o.Rollback() + + if err := o.DoTx(func(ctx context.Context, txOrm orm.TxOrmer) error { + _, err = txOrm.Raw("DELETE FROM "+NewTemplate().TableNameWithPrefix()+" WHERE book_id = ?", book.BookId).Exec() + return err + }); err != nil { return err } @@ -470,7 +516,7 @@ func (book *Book) ThoroughDeleteBook(id int) error { logs.Error("删除项目附件和图片失败 ->", err) } - return o.Commit() + return nil } diff --git a/models/BookResult.go b/models/BookResult.go index 2b1a3c02..f26a4d4e 100644 --- a/models/BookResult.go +++ b/models/BookResult.go @@ -16,7 +16,7 @@ import ( "github.com/PuerkitoBio/goquery" "github.com/beego/beego/v2/adapter" "github.com/beego/beego/v2/adapter/logs" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/server/web" "github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/converter" diff --git a/models/Dashboard.go b/models/Dashboard.go index 0ed42356..e8221bd4 100644 --- a/models/Dashboard.go +++ b/models/Dashboard.go @@ -1,6 +1,6 @@ package models -import "github.com/beego/beego/v2/adapter/orm" +import "github.com/beego/beego/v2/client/orm" type Dashboard struct { BookNumber int64 `json:"book_number"` diff --git a/models/DocumentHistory.go b/models/DocumentHistory.go index 655c8292..5f3c7b2b 100644 --- a/models/DocumentHistory.go +++ b/models/DocumentHistory.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/DocumentSearchResult.go b/models/DocumentSearchResult.go index 05c92f77..78048bf7 100644 --- a/models/DocumentSearchResult.go +++ b/models/DocumentSearchResult.go @@ -5,7 +5,7 @@ import ( "strings" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" ) diff --git a/models/DocumentTree.go b/models/DocumentTree.go index 029d8d35..7a0c8dcc 100644 --- a/models/DocumentTree.go +++ b/models/DocumentTree.go @@ -6,7 +6,7 @@ import ( "html/template" "math" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/Itemsets.go b/models/Itemsets.go index abe290a6..de7ba523 100644 --- a/models/Itemsets.go +++ b/models/Itemsets.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/beego/beego/v2/adapter/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/utils" @@ -112,8 +112,9 @@ func (item *Itemsets) Delete(itemId int) (err error) { if !item.Exist(itemId) { return errors.New("项目空间不存在") } - o := orm.NewOrm() - if err := o.Begin(); err != nil { + ormer := orm.NewOrm() + o, err := ormer.Begin() + if err != nil { logs.Error("开启事物失败 ->", err) return err } diff --git a/models/LabelModel.go b/models/LabelModel.go index 363ba4d1..49a8ebf8 100644 --- a/models/LabelModel.go +++ b/models/LabelModel.go @@ -3,7 +3,7 @@ package models import ( "strings" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/Logs.go b/models/Logs.go index 0e8e22a0..da662f9d 100644 --- a/models/Logs.go +++ b/models/Logs.go @@ -5,7 +5,7 @@ import ( "sync/atomic" "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/Member.go b/models/Member.go index 5cfe798e..df44ab4c 100644 --- a/models/Member.go +++ b/models/Member.go @@ -19,7 +19,7 @@ import ( "math" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/beego/beego/v2/server/web" "github.com/mindoc-org/mindoc/conf" @@ -81,7 +81,7 @@ func (m *Member) Login(account string, password string) (*Member, error) { logs.Info("转入 HTTP 接口登陆 ->", account) return member.httpLogin(account, password) } else { - logs.Error("user login for `%s`: %s",account, err) + logs.Error("user login for `%s`: %s", account, err) return member, ErrMemberNoExist } } @@ -180,7 +180,7 @@ func (m *Member) ldapLogin(account string, password string) (*Member, error) { } func (m *Member) httpLogin(account, password string) (*Member, error) { - urlStr,_ := web.AppConfig.String("http_login_url") + urlStr, _ := web.AppConfig.String("http_login_url") if urlStr == "" { return nil, ErrMemberAuthMethodInvalid } @@ -462,9 +462,9 @@ func (m *Member) Valid(is_hash_password bool) error { //删除一个用户. func (m *Member) Delete(oldId int, newId int) error { - o := orm.NewOrm() + ormer := orm.NewOrm() - err := o.Begin() + o, err := ormer.Begin() if err != nil { return err diff --git a/models/MemberResult.go b/models/MemberResult.go index 0e1925bd..d3b69f3e 100644 --- a/models/MemberResult.go +++ b/models/MemberResult.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/MemberToken.go b/models/MemberToken.go index 6a57f693..5a4bd96e 100644 --- a/models/MemberToken.go +++ b/models/MemberToken.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/Migrations.go b/models/Migrations.go index 05db4de4..a91a4870 100644 --- a/models/Migrations.go +++ b/models/Migrations.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/Options.go b/models/Options.go index 1d7f2d82..8673b9ff 100644 --- a/models/Options.go +++ b/models/Options.go @@ -1,7 +1,7 @@ package models import ( - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/Relationship.go b/models/Relationship.go index 6074f21e..22ab6382 100644 --- a/models/Relationship.go +++ b/models/Relationship.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/beego/beego/v2/adapter/logs" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" ) @@ -122,11 +122,11 @@ func (m *Relationship) Insert() error { return err } -func (m *Relationship) Update() error { - o := orm.NewOrm() - - _, err := o.Update(m) - +func (m *Relationship) Update(txOrm orm.TxOrmer) error { + _, err := txOrm.Update(m) + if err != nil { + txOrm.Rollback() + } return err } @@ -152,11 +152,11 @@ func (m *Relationship) DeleteByBookIdAndMemberId(book_id, member_id int) error { } func (m *Relationship) Transfer(book_id, founder_id, receive_id int) error { - o := orm.NewOrm() + ormer := orm.NewOrm() founder := NewRelationship() - err := o.QueryTable(m.TableNameWithPrefix()).Filter("book_id", book_id).Filter("member_id", founder_id).One(founder) + err := ormer.QueryTable(m.TableNameWithPrefix()).Filter("book_id", book_id).Filter("member_id", founder_id).One(founder) if err != nil { return err @@ -166,12 +166,12 @@ func (m *Relationship) Transfer(book_id, founder_id, receive_id int) error { } receive := NewRelationship() - err = o.QueryTable(m.TableNameWithPrefix()).Filter("book_id", book_id).Filter("member_id", receive_id).One(receive) + err = ormer.QueryTable(m.TableNameWithPrefix()).Filter("book_id", book_id).Filter("member_id", receive_id).One(receive) if err != orm.ErrNoRows && err != nil { return err } - o.Begin() + o, _ := ormer.Begin() founder.RoleId = conf.BookAdmin @@ -179,8 +179,7 @@ func (m *Relationship) Transfer(book_id, founder_id, receive_id int) error { receive.RoleId = conf.BookFounder receive.BookId = book_id - if err := founder.Update(); err != nil { - o.Rollback() + if err := founder.Update(o); err != nil { return err } if receive.RelationshipId > 0 { diff --git a/models/Team.go b/models/Team.go index 17a5fd9d..c7226d76 100644 --- a/models/Team.go +++ b/models/Team.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" ) @@ -59,9 +59,9 @@ func (t *Team) Delete(id int) (err error) { if id <= 0 { return ErrInvalidParameter } - o := orm.NewOrm() + ormer := orm.NewOrm() - err = o.Begin() + o, err := ormer.Begin() if err != nil { logs.Error("开启事物时出错 ->", err) diff --git a/models/TeamMember.go b/models/TeamMember.go index 3eb1f88d..a4302085 100644 --- a/models/TeamMember.go +++ b/models/TeamMember.go @@ -3,7 +3,7 @@ package models import ( "errors" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/TeamRelationship.go b/models/TeamRelationship.go index 0efb61cc..e6e82a7f 100644 --- a/models/TeamRelationship.go +++ b/models/TeamRelationship.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/logs" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/comment.go b/models/comment.go index b018ab9b..0786a464 100644 --- a/models/comment.go +++ b/models/comment.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" ) diff --git a/models/comment_result.go b/models/comment_result.go index 01ec524c..acbd1eec 100644 --- a/models/comment_result.go +++ b/models/comment_result.go @@ -1,6 +1,6 @@ package models -import "github.com/beego/beego/v2/adapter/orm" +import "github.com/beego/beego/v2/client/orm" type CommentResult struct { Comment diff --git a/models/comment_vote.go b/models/comment_vote.go index 63eb4698..544df97f 100644 --- a/models/comment_vote.go +++ b/models/comment_vote.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/beego/beego/v2/adapter/orm" + "github.com/beego/beego/v2/client/orm" "github.com/mindoc-org/mindoc/conf" )