From 992d8925235264140da2c18988f42aff7a71a25c Mon Sep 17 00:00:00 2001
From: wenjianzhang <zwj777@live.com>
Date: Tue, 15 Jun 2021 12:16:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor=F0=9F=8E=A8=EF=BC=9A=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration/version/1599190683659_tables.go | 71 ++++++++++---------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go
index f30fe52e..3d2fb5f2 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