diff --git a/app/admin/models/filedir.go b/app/admin/models/filedir.go index 91c67fd..627c7e0 100644 --- a/app/admin/models/filedir.go +++ b/app/admin/models/filedir.go @@ -3,9 +3,11 @@ package models import ( orm "go-admin/common/global" "go-admin/tools" + "gorm.io/gorm" ) type SysFileDir struct { + gorm.Model Id int `json:"id" gorm:"type:int(11);primary_key;AUTO_INCREMENT"` // Label string `json:"label" gorm:"type:varchar(255);"` // 名称 PId int `json:"pId" gorm:"type:int(11);"` // 父id @@ -16,7 +18,6 @@ type SysFileDir struct { Children []SysFileDir `json:"children" gorm:"-"` DataScope string `json:"dataScope" gorm:"-"` Params string `json:"params" gorm:"-"` - BaseModel } func (SysFileDir) TableName() string { diff --git a/cmd/migrate/migration/init.go b/cmd/migrate/migration/init.go index 68c755f..ec6a8a2 100644 --- a/cmd/migrate/migration/init.go +++ b/cmd/migrate/migration/init.go @@ -41,7 +41,7 @@ func (e *Migration) Migrate() { var err error var count int64 for _, v := range versions { - err = e.db.Table("sys_migration").Where("version = ?", v).Count(&count).Error + err = e.db.Debug().Table("sys_migration").Where("version = ?", v).Count(&count).Error if err != nil { log.Fatalln(err) } @@ -50,7 +50,7 @@ func (e *Migration) Migrate() { count = 0 continue } - err = (e.version[v])(e.db, v) + err = (e.version[v])(e.db.Debug(), v) if err != nil { log.Fatalln(err) } diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index d7a34c6..85c4ece 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -18,35 +18,33 @@ func init() { } func _1599190683659Tables(db *gorm.DB, version string) error { - return db.Transaction(func(tx *gorm.DB) error { - // - err := tx.Migrator().AutoMigrate( - new(models.CasbinRule), - new(models.SysDept), - new(models.SysConfig), - new(tools.SysTables), - new(tools.SysColumns), - new(models.Menu), - new(models.LoginLog), - new(models.SysOperLog), - new(models.RoleMenu), - new(models.SysRoleDept), - new(models.SysUser), - new(models.SysRole), - new(models.Post), - new(models.DictData), - new(models.DictType), - new(models.SysJob), - new(models.SysConfig), - new(models.SysSetting), - new(models.SysFileDir), - new(models.SysCategory), - new(models.SysContent)) - if err != nil { - return err - } - return tx.Create(&common.Migration{ - Version: version, - }).Error - }) + err := db.Migrator().AutoMigrate( + new(models.CasbinRule), + new(models.SysDept), + new(models.SysConfig), + new(tools.SysTables), + new(tools.SysColumns), + new(models.Menu), + new(models.LoginLog), + new(models.SysOperLog), + new(models.RoleMenu), + new(models.SysRoleDept), + new(models.SysUser), + new(models.SysRole), + new(models.Post), + new(models.DictData), + new(models.DictType), + new(models.SysJob), + new(models.SysConfig), + new(models.SysSetting), + new(models.SysFileDir), + new(models.SysCategory), + new(models.SysContent), + ) + if err != nil { + return err + } + return db.Create(&common.Migration{ + Version: version, + }).Error }