Merge branch 'dev' of https://github.com/go-admin-team/go-admin into go-admin-team-dev

app/admin/models/sys_meun.go

@@ -3,46 +3,46 @@ package models
 import "go-admin/common/models"
 
 type SysMenu struct {
-	MenuId     int    `json:"menuId" gorm:"primary_key;AUTO_INCREMENT"`
+	MenuId     int       `json:"menuId" gorm:"primary_key;AUTO_INCREMENT"`
-	MenuName   string `json:"menuName" gorm:"size:128;"`
+	MenuName   string    `json:"menuName" gorm:"size:128;"`
-	Title      string `json:"title" gorm:"size:128;"`
+	Title      string    `json:"title" gorm:"size:128;"`
-	Icon       string `json:"icon" gorm:"size:128;"`
+	Icon       string    `json:"icon" gorm:"size:128;"`
-	Path       string `json:"path" gorm:"size:128;"`
+	Path       string    `json:"path" gorm:"size:128;"`
-	Paths      string `json:"paths" gorm:"size:128;"`
+	Paths      string    `json:"paths" gorm:"size:128;"`
-	MenuType   string `json:"menuType" gorm:"size:1;"`
+	MenuType   string    `json:"menuType" gorm:"size:1;"`
-	Action     string `json:"action" gorm:"size:16;"`
+	Action     string    `json:"action" gorm:"size:16;"`
-	Permission string `json:"permission" gorm:"size:255;"`
+	Permission string    `json:"permission" gorm:"size:255;"`
-	ParentId   int    `json:"parentId" gorm:"size:11;"`
+	ParentId   int       `json:"parentId" gorm:"size:11;"`
-	NoCache    bool   `json:"noCache" gorm:"size:8;"`
+	NoCache    bool      `json:"noCache" gorm:"size:8;"`
-	Breadcrumb string `json:"breadcrumb" gorm:"size:255;"`
+	Breadcrumb string    `json:"breadcrumb" gorm:"size:255;"`
-	Component  string `json:"component" gorm:"size:255;"`
+	Component  string    `json:"component" gorm:"size:255;"`
-	Sort       int    `json:"sort" gorm:"size:4;"`
+	Sort       int       `json:"sort" gorm:"size:4;"`
-	Visible    string `json:"visible" gorm:"size:1;"`
+	Visible    string    `json:"visible" gorm:"size:1;"`
-	IsFrame    string `json:"isFrame" gorm:"size:1;DEFAULT:0;"`
+	IsFrame    string    `json:"isFrame" gorm:"size:1;DEFAULT:0;"`
+	DataScope  string    `json:"dataScope" gorm:"-"`
+	Params     string    `json:"params" gorm:"-"`
+	RoleId     int       `gorm:"-"`
+	Children   []SysMenu `json:"children" gorm:"-"`
+	IsSelect   bool      `json:"is_select" gorm:"-"`
 	models.ControlBy
 	models.ModelTime
-	DataScope string `json:"dataScope" gorm:"-"`
-	Params    string `json:"params" gorm:"-"`
-	RoleId    int    `gorm:"-"`
-	Children  []SysMenu `json:"children" gorm:"-"`
-	IsSelect  bool   `json:"is_select" gorm:"-"`
 }
 
 type SysMenus struct {
-	MenuId     int    `json:"menuId" gorm:"column:menu_id;primary_key;"`
+	MenuId     int       `json:"menuId" gorm:"column:menu_id;primary_key;"`
-	MenuName   string `json:"menuName" gorm:"column:menu_name"`
+	MenuName   string    `json:"menuName" gorm:"column:menu_name"`
-	Title      string `json:"title" gorm:"column:title"`
+	Title      string    `json:"title" gorm:"column:title"`
-	Icon       string `json:"icon" gorm:"column:icon"`
+	Icon       string    `json:"icon" gorm:"column:icon"`
-	Path       string `json:"path" gorm:"column:path"`
+	Path       string    `json:"path" gorm:"column:path"`
-	MenuType   string `json:"menuType" gorm:"column:menu_type"`
+	MenuType   string    `json:"menuType" gorm:"column:menu_type"`
-	Action     string `json:"action" gorm:"column:action"`
+	Action     string    `json:"action" gorm:"column:action"`
-	Permission string `json:"permission" gorm:"column:permission"`
+	Permission string    `json:"permission" gorm:"column:permission"`
-	ParentId   int    `json:"parentId" gorm:"column:parent_id"`
+	ParentId   int       `json:"parentId" gorm:"column:parent_id"`
-	NoCache    bool   `json:"noCache" gorm:"column:no_cache"`
+	NoCache    bool      `json:"noCache" gorm:"column:no_cache"`
-	Breadcrumb string `json:"breadcrumb" gorm:"column:breadcrumb"`
+	Breadcrumb string    `json:"breadcrumb" gorm:"column:breadcrumb"`
-	Component  string `json:"component" gorm:"column:component"`
+	Component  string    `json:"component" gorm:"column:component"`
-	Sort       int    `json:"sort" gorm:"column:sort"`
+	Sort       int       `json:"sort" gorm:"column:sort"`
-	Visible    string `json:"visible" gorm:"column:visible"`
+	Visible    string    `json:"visible" gorm:"column:visible"`
 	Children   []SysMenu `json:"children" gorm:"-"`
 	models.ControlBy
 	models.ModelTime

app/admin/models/system/sys_role.go

@@ -12,11 +12,11 @@ type SysRole struct {
 	Remark    string `json:"remark" gorm:"size:255;"`                  //备注
 	Admin     bool   `json:"admin" gorm:"size:4;"`
 	DataScope string `json:"dataScope" gorm:"size:128;"`
+	Params    string `json:"params" gorm:"-"`
+	MenuIds   []int  `json:"menuIds" gorm:"-"`
+	DeptIds   []int  `json:"deptIds" gorm:"-"`
 	models.ControlBy
 	models.ModelTime
-	Params  string `json:"params" gorm:"-"`
-	MenuIds []int  `json:"menuIds" gorm:"-"`
-	DeptIds []int  `json:"deptIds" gorm:"-"`
 }
 
 func (SysRole) TableName() string {

cmd/migrate/migration/version/1613697961697_migrate.go

@@ -0,0 +1,46 @@
+package version
+
+import (
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/system"
+
+	//"go-admin/app/admin/models"
+	"gorm.io/gorm"
+	"runtime"
+
+	"go-admin/cmd/migrate/migration"
+	common "go-admin/common/models"
+)
+
+func init() {
+	_, fileName, _, _ := runtime.Caller(0)
+	migration.Migrate.SetVersion(migration.GetFilename(fileName), _1613697961697Test)
+}
+
+func _1613697961697Test(db *gorm.DB, version string) error {
+	return db.Transaction(func(tx *gorm.DB) error {
+
+		//修改字段类型
+		err := tx.Migrator().AlterColumn(&models.SysMenu{}, "create_by")
+		if err != nil {
+			return err
+		}
+		err = tx.Migrator().AlterColumn(&models.SysMenu{}, "update_by")
+		if err != nil {
+			return err
+		}
+
+		err = tx.Migrator().AlterColumn(&system.SysRole{}, "create_by")
+		if err != nil {
+			return err
+		}
+		err = tx.Migrator().AlterColumn(&system.SysRole{}, "update_by")
+		if err != nil {
+			return err
+		}
+
+		return tx.Create(&common.Migration{
+			Version: version,
+		}).Error
+	})
+}