add err := and delete postgresql initdb

This commit is contained in:
SliverHorn
2020-10-29 22:13:24 +08:00
parent 10d8d7f28a
commit 7488db81c1
13 changed files with 17 additions and 104 deletions

View File

@@ -153,16 +153,11 @@ var Carbines = []gormadapter.CasbinRule{
func InitCasbinModel(db *gorm.DB) (err error) {
return db.Transaction(func(tx *gorm.DB) error {
if !tx.Migrator().HasTable("casbin_rule") {
if err := tx.Migrator().CreateTable(&gormadapter.CasbinRule{}); err != nil {
return err
}
}
if tx.Where("p_type = ? AND v0 IN ?", "p", []string{"888", "8881", "9528"}).Find(&[]gormadapter.CasbinRule{}).RowsAffected == 142 {
color.Danger.Println("casbin_rule表的初始数据已存在!")
return nil
}
if tx.Create(&Carbines).Error != nil { // 遇到错误时回滚事务
if err := tx.Create(&Carbines).Error; err != nil { // 遇到错误时回滚事务
return err
}
return nil