From 86700cfd5232c26c3c678fafbbe79b77e44a9800 Mon Sep 17 00:00:00 2001
From: linwenxiang <991154416@qq.com>
Date: Fri, 5 Mar 2021 17:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migration/version/1599190683659_tables.go |  2 --
 .../version/1599190683670_migrate.go          |  6 ++----
 .../version/1599190683680_migrate.go          |  2 --
 .../version/1600089797118_migrate.go          |  2 --
 .../version/1602644950000_migrate.go          |  2 --
 .../version/1603465014697_migrate.go          |  2 --
 .../version/1603516925109_migrate.go          |  2 --
 .../version/1606579402398_migrate.go          |  2 --
 .../version/1606582844753_migrate.go          |  2 --
 .../version/1610427732413_migrate.go          |  2 --
 .../version/1610804233204_migrate.go          |  2 --
 .../version/1613638159444_migrate.go          |  2 --
 .../version/1613697961697_migrate.go          |  2 --
 .../version/1613720892819_migrate.go          |  2 --
 .../version/1613783303115_migrate.go          | 20 ++++++++++++++++---
 .../version/1613978564961_migrate.go          |  2 --
 .../version/1613998164781_migrate.go          |  2 --
 .../version/1614073723691_migrate.go          |  2 --
 .../version/1614159531111_migrate.go          |  2 --
 .../version/1614604763713_migrate.go          |  2 --
 cmd/migrate/server.go                         |  2 +-
 21 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go
index 4ee92d37..a453d3c1 100644
--- a/cmd/migrate/migration/version/1599190683659_tables.go
+++ b/cmd/migrate/migration/version/1599190683659_tables.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1599190683670_migrate.go b/cmd/migrate/migration/version/1599190683670_migrate.go
index 18394e80..a4c9097e 100644
--- a/cmd/migrate/migration/version/1599190683670_migrate.go
+++ b/cmd/migrate/migration/version/1599190683670_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
@@ -43,7 +41,7 @@ func _1599190683670Test(db *gorm.DB, version string) error {
 		}
 
 		list6 := []models.SysRole{
-			{1, "系统管理员", "2", "admin", 1, "", "1", "", "", true, "", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}, "", []int{}, []int{}},
+			{1, "系统管理员", "2", "admin", 1, "", "1", "0", "", true, "", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}, "", []int{}, []int{}},
 		}
 
 		list7 := []DictType{
@@ -71,7 +69,7 @@ func _1599190683670Test(db *gorm.DB, version string) error {
 				},
 				UserId:   1,
 				Username: "admin",
-				Password: "$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2",
+				Password: "123456",
 				NickName: "zhangwj",
 				Phone:    "13818888888",
 				RoleId:   1,
diff --git a/cmd/migrate/migration/version/1599190683680_migrate.go b/cmd/migrate/migration/version/1599190683680_migrate.go
index 99480c71..8a5c5a37 100644
--- a/cmd/migrate/migration/version/1599190683680_migrate.go
+++ b/cmd/migrate/migration/version/1599190683680_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1600089797118_migrate.go b/cmd/migrate/migration/version/1600089797118_migrate.go
index 774af0ee..12b603ba 100644
--- a/cmd/migrate/migration/version/1600089797118_migrate.go
+++ b/cmd/migrate/migration/version/1600089797118_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1602644950000_migrate.go b/cmd/migrate/migration/version/1602644950000_migrate.go
index e9984401..8a7ca0b9 100644
--- a/cmd/migrate/migration/version/1602644950000_migrate.go
+++ b/cmd/migrate/migration/version/1602644950000_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1603465014697_migrate.go b/cmd/migrate/migration/version/1603465014697_migrate.go
index 82236fe1..63aed144 100644
--- a/cmd/migrate/migration/version/1603465014697_migrate.go
+++ b/cmd/migrate/migration/version/1603465014697_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1603516925109_migrate.go b/cmd/migrate/migration/version/1603516925109_migrate.go
index 043abf07..f2539cfb 100644
--- a/cmd/migrate/migration/version/1603516925109_migrate.go
+++ b/cmd/migrate/migration/version/1603516925109_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1606579402398_migrate.go b/cmd/migrate/migration/version/1606579402398_migrate.go
index 2dfee83a..0e5c5226 100644
--- a/cmd/migrate/migration/version/1606579402398_migrate.go
+++ b/cmd/migrate/migration/version/1606579402398_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1606582844753_migrate.go b/cmd/migrate/migration/version/1606582844753_migrate.go
index ed444a54..9245a9d3 100644
--- a/cmd/migrate/migration/version/1606582844753_migrate.go
+++ b/cmd/migrate/migration/version/1606582844753_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1610427732413_migrate.go b/cmd/migrate/migration/version/1610427732413_migrate.go
index c98142ad..83fc1c60 100644
--- a/cmd/migrate/migration/version/1610427732413_migrate.go
+++ b/cmd/migrate/migration/version/1610427732413_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1610804233204_migrate.go b/cmd/migrate/migration/version/1610804233204_migrate.go
index a8884f2f..390515bd 100644
--- a/cmd/migrate/migration/version/1610804233204_migrate.go
+++ b/cmd/migrate/migration/version/1610804233204_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1613638159444_migrate.go b/cmd/migrate/migration/version/1613638159444_migrate.go
index 26aa8190..9a0c4faf 100644
--- a/cmd/migrate/migration/version/1613638159444_migrate.go
+++ b/cmd/migrate/migration/version/1613638159444_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1613697961697_migrate.go b/cmd/migrate/migration/version/1613697961697_migrate.go
index 24a88ca3..9e52af8c 100644
--- a/cmd/migrate/migration/version/1613697961697_migrate.go
+++ b/cmd/migrate/migration/version/1613697961697_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1613720892819_migrate.go b/cmd/migrate/migration/version/1613720892819_migrate.go
index 13b436bb..dc7ef431 100644
--- a/cmd/migrate/migration/version/1613720892819_migrate.go
+++ b/cmd/migrate/migration/version/1613720892819_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1613783303115_migrate.go b/cmd/migrate/migration/version/1613783303115_migrate.go
index 735cfed7..9d85c585 100644
--- a/cmd/migrate/migration/version/1613783303115_migrate.go
+++ b/cmd/migrate/migration/version/1613783303115_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
@@ -22,7 +20,23 @@ func _1613783303115Test(db *gorm.DB, version string) error {
 	return db.Transaction(func(tx *gorm.DB) error {
 
 		//修改字段类型
-		err := tx.Migrator().AlterColumn(&system.SysDictType{}, "create_by")
+		err := tx.Model(&system.SysDictType{}).Select("create_by").Not("create_by  > 0").Update("create_by", 0).Error
+		if err != nil {
+			return err
+		}
+		err = tx.Model(&system.SysDictType{}).Select("update_by").Not("update_by > 0").Update("update_by", 0).Error
+		if err != nil {
+			return err
+		}
+		err = tx.Model(&system.SysDictData{}).Select("create_by").Not("create_by > 0").Update("create_by", 0).Error
+		if err != nil {
+			return err
+		}
+		err = tx.Model(&system.SysDictData{}).Select("update_by").Not("update_by > 0").Update("update_by", 0).Error
+		if err != nil {
+			return err
+		}
+		err = tx.Migrator().AlterColumn(&system.SysDictType{}, "create_by")
 		if err != nil {
 			return err
 		}
diff --git a/cmd/migrate/migration/version/1613978564961_migrate.go b/cmd/migrate/migration/version/1613978564961_migrate.go
index c0b8c29b..39d231ca 100644
--- a/cmd/migrate/migration/version/1613978564961_migrate.go
+++ b/cmd/migrate/migration/version/1613978564961_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1613998164781_migrate.go b/cmd/migrate/migration/version/1613998164781_migrate.go
index 7af1d2a5..4e201cd8 100644
--- a/cmd/migrate/migration/version/1613998164781_migrate.go
+++ b/cmd/migrate/migration/version/1613998164781_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1614073723691_migrate.go b/cmd/migrate/migration/version/1614073723691_migrate.go
index 32064263..16014326 100644
--- a/cmd/migrate/migration/version/1614073723691_migrate.go
+++ b/cmd/migrate/migration/version/1614073723691_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1614159531111_migrate.go b/cmd/migrate/migration/version/1614159531111_migrate.go
index bb2eb526..e9e191d9 100644
--- a/cmd/migrate/migration/version/1614159531111_migrate.go
+++ b/cmd/migrate/migration/version/1614159531111_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/migration/version/1614604763713_migrate.go b/cmd/migrate/migration/version/1614604763713_migrate.go
index cc70ae3a..631851ce 100644
--- a/cmd/migrate/migration/version/1614604763713_migrate.go
+++ b/cmd/migrate/migration/version/1614604763713_migrate.go
@@ -1,5 +1,3 @@
-// +build ignore
-
 package version
 
 import (
diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go
index 35d1e976..c233d468 100644
--- a/cmd/migrate/server.go
+++ b/cmd/migrate/server.go
@@ -36,7 +36,7 @@ var (
 	}
 )
 
-// fixme 在您看不见代码的时候运行迁移，我觉得是不安全的，所以编译后将不包含所有迁移文件
+// fixme 在您看不见代码的时候运行迁移，我觉得是不安全的，所以编译后最好不要去执行迁移
 func init() {
 	StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
 	StartCmd.PersistentFlags().BoolVarP(&generate, "generate", "g", false, "generate migration file")