fix(member): use client/orm insteal of adapter/orm

- to avoid type check bug when comparing error, use newer api instead of
old adapter
This commit is contained in:
roberChen 2021-03-25 15:32:44 +08:00
parent 272316f7b4
commit d069b7c515

View File

@ -1,13 +1,14 @@
package commands package commands
import ( import (
"errors"
"fmt" "fmt"
"os" "os"
"time" "time"
"flag" "flag"
"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/core/logs"
"github.com/mindoc-org/mindoc/conf" "github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models" "github.com/mindoc-org/mindoc/models"
@ -101,7 +102,7 @@ func initialization() {
} }
member, err := models.NewMember().FindByFieldFirst("account", "admin") member, err := models.NewMember().FindByFieldFirst("account", "admin")
if err == orm.ErrNoRows { if errors.Is(err, orm.ErrNoRows) {
// create admin user // create admin user
logs.Info("creating admin user") logs.Info("creating admin user")
@ -139,6 +140,8 @@ func initialization() {
if err := book.Insert(); err != nil { if err := book.Insert(); err != nil {
panic("初始化项目失败 -> " + err.Error()) panic("初始化项目失败 -> " + err.Error())
} }
} else if err != nil {
panic(fmt.Errorf("occur errors when initialize: %s", err))
} }
if !models.NewItemsets().Exist(1) { if !models.NewItemsets().Exist(1) {