Merge branch 'dev' of https://github.com/go-admin-team/go-admin into go-admin-team-dev
This commit is contained in:
commit
a4f8b11925
3 files changed
+50
-4
No files matched your search
@@ -19,13 +19,13 @@ type SysMenu struct {
|
|||||||
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;"`
|
||||||
models.ControlBy
|
|
||||||
models.ModelTime
|
|
||||||
DataScope string `json:"dataScope" gorm:"-"`
|
DataScope string `json:"dataScope" gorm:"-"`
|
||||||
Params string `json:"params" gorm:"-"`
|
Params string `json:"params" gorm:"-"`
|
||||||
RoleId int `gorm:"-"`
|
RoleId int `gorm:"-"`
|
||||||
Children []SysMenu `json:"children" gorm:"-"`
|
Children []SysMenu `json:"children" gorm:"-"`
|
||||||
IsSelect bool `json:"is_select" gorm:"-"`
|
IsSelect bool `json:"is_select" gorm:"-"`
|
||||||
|
models.ControlBy
|
||||||
|
models.ModelTime
|
||||||
}
|
}
|
||||||
|
|
||||||
type SysMenus struct {
|
type SysMenus struct {
|
||||||
|
|||||||
@@ -12,11 +12,11 @@ type SysRole struct {
|
|||||||
Remark string `json:"remark" gorm:"size:255;"` //备注
|
Remark string `json:"remark" gorm:"size:255;"` //备注
|
||||||
Admin bool `json:"admin" gorm:"size:4;"`
|
Admin bool `json:"admin" gorm:"size:4;"`
|
||||||
DataScope string `json:"dataScope" gorm:"size:128;"`
|
DataScope string `json:"dataScope" gorm:"size:128;"`
|
||||||
models.ControlBy
|
|
||||||
models.ModelTime
|
|
||||||
Params string `json:"params" gorm:"-"`
|
Params string `json:"params" gorm:"-"`
|
||||||
MenuIds []int `json:"menuIds" gorm:"-"`
|
MenuIds []int `json:"menuIds" gorm:"-"`
|
||||||
DeptIds []int `json:"deptIds" gorm:"-"`
|
DeptIds []int `json:"deptIds" gorm:"-"`
|
||||||
|
models.ControlBy
|
||||||
|
models.ModelTime
|
||||||
}
|
}
|
||||||
|
|
||||||
func (SysRole) TableName() string {
|
func (SysRole) TableName() string {
|
||||||
|
|||||||
@@ -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
|
||||||
|
})
|
||||||
|
}
|
||||||
Reference in new issue
Block a user