diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index f30fe52..3d2fb5f 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -16,36 +16,41 @@ func init() { } func _1599190683659Tables(db *gorm.DB, version string) error { - err := db.Debug().Migrator().AutoMigrate( - new(models.CasbinRule), - new(models.SysDept), - new(models.SysConfig), - new(models.SysTables), - new(models.SysColumns), - new(models.SysMenu), - new(models.SysLoginLog), - new(models.SysOperaLog), - new(models.SysRoleDept), - new(models.SysUser), - new(models.SysRole), - new(models.SysPost), - new(models.DictData), - new(models.DictType), - new(models.SysChinaAreaData), - new(models.SysJob), - new(models.SysConfig), - new(models.SysSetting), - new(models.SysFileDir), - new(models.SysFileInfo), - new(models.SysCategory), - new(models.SysContent), - new(models.SysApi), - new(models.SysChinaAreaData), - ) - if err != nil { - return err - } - return db.Create(&common.Migration{ - Version: version, - }).Error -} + return db.Transaction(func(tx *gorm.DB) error { + err := tx.Debug().Migrator().AutoMigrate( + new(models.CasbinRule), + new(models.SysDept), + new(models.SysConfig), + new(models.SysTables), + new(models.SysColumns), + new(models.SysMenu), + new(models.SysLoginLog), + new(models.SysOperaLog), + new(models.SysRoleDept), + new(models.SysUser), + new(models.SysRole), + new(models.SysPost), + new(models.DictData), + new(models.DictType), + new(models.SysChinaAreaData), + new(models.SysJob), + new(models.SysConfig), + new(models.SysSetting), + new(models.SysFileDir), + new(models.SysFileInfo), + new(models.SysCategory), + new(models.SysContent), + new(models.SysApi), + new(models.SysChinaAreaData), + ) + if err != nil { + return err + } + if err := models.InitDb(tx); err != nil { + + } + return db.Create(&common.Migration{ + Version: version, + }).Error + }) +} \ No newline at end of file