一些小修复 (flipped-aurora#1085)

pnck · web-flow · commit bf1cd15949ee · 2022-05-26T14:45:20.000+08:00
* chore: 去掉初始化中误加的额外表

* chore: 修复初始化不应使用的GVA_DB
diff --git a/server/model/system/sys_base_menu.go b/server/model/system/sys_base_menu.go
@@ -6,18 +6,18 @@ import (
 
 type SysBaseMenu struct {
 	global.GVA_MODEL
-	MenuLevel     uint                              `json:"-"`
-	ParentId      string                            `json:"parentId" gorm:"comment:父菜单ID"`     // 父菜单ID
-	Path          string                            `json:"path" gorm:"comment:路由path"`        // 路由path
-	Name          string                            `json:"name" gorm:"comment:路由name"`        // 路由name
-	Hidden        bool                              `json:"hidden" gorm:"comment:是否在列表隐藏"`     // 是否在列表隐藏
-	Component     string                            `json:"component" gorm:"comment:对应前端文件路径"` // 对应前端文件路径
-	Sort          int                               `json:"sort" gorm:"comment:排序标记"`          // 排序标记
-	Meta          `json:"meta" gorm:"comment:附加属性"` // 附加属性
-	SysAuthoritys []SysAuthority                    `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
-	Children      []SysBaseMenu                     `json:"children" gorm:"-"`
-	Parameters    []SysBaseMenuParameter            `json:"parameters"`
-	MenuBtn       []SysBaseMenuBtn                  `json:"menuBtn"`
+	MenuLevel     uint                                       `json:"-"`
+	ParentId      string                                     `json:"parentId" gorm:"comment:父菜单ID"`     // 父菜单ID
+	Path          string                                     `json:"path" gorm:"comment:路由path"`        // 路由path
+	Name          string                                     `json:"name" gorm:"comment:路由name"`        // 路由name
+	Hidden        bool                                       `json:"hidden" gorm:"comment:是否在列表隐藏"`     // 是否在列表隐藏
+	Component     string                                     `json:"component" gorm:"comment:对应前端文件路径"` // 对应前端文件路径
+	Sort          int                                        `json:"sort" gorm:"comment:排序标记"`          // 排序标记
+	Meta          `json:"meta" gorm:"embedded;comment:附加属性"` // 附加属性
+	SysAuthoritys []SysAuthority                             `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
+	Children      []SysBaseMenu                              `json:"children" gorm:"-"`
+	Parameters    []SysBaseMenuParameter                     `json:"parameters"`
+	MenuBtn       []SysBaseMenuBtn                           `json:"menuBtn"`
 }
 
 type Meta struct {
diff --git a/server/source/system/menu.go b/server/source/system/menu.go
@@ -29,7 +29,6 @@ func (i *initMenu) MigrateTable(ctx context.Context) (context.Context, error) {
 	return ctx, db.AutoMigrate(
 		&SysBaseMenu{},
 		&SysBaseMenuParameter{},
-		&Meta{},
 		&SysBaseMenuBtn{},
 	)
 }
@@ -41,7 +40,6 @@ func (i *initMenu) TableCreated(ctx context.Context) bool {
 	}
 	m := db.Migrator()
 	return m.HasTable(&SysBaseMenu{}) &&
-		m.HasTable(&Meta{}) &&
 		m.HasTable(&SysBaseMenuParameter{}) &&
 		m.HasTable(&SysBaseMenuBtn{})
 }
diff --git a/server/source/system/user.go b/server/source/system/user.go
@@ -2,7 +2,6 @@ package system
 
 import (
 	"context"
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	"github.com/flipped-aurora/gin-vue-admin/server/service/system"
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
@@ -69,7 +68,7 @@ func (i *initUser) InitializeData(ctx context.Context) (next context.Context, er
 			Phone:       "17611111111",
 			Email:       "333333333@qq.com"},
 	}
-	if err = global.GVA_DB.Create(&entities).Error; err != nil {
+	if err = db.Create(&entities).Error; err != nil {
 		return ctx, errors.Wrap(err, sysModel.SysUser{}.TableName()+"表数据初始化失败!")
 	}
 	next = context.WithValue(ctx, i.InitializerName(), entities)
diff --git a/server/source/system/view_authority_menu_postgres.go b/server/source/system/view_authority_menu_postgres.go
@@ -67,14 +67,18 @@ func (a *initMenuViewPg) MigrateTable(ctx context.Context) (context.Context, err
 	sql = strings.ReplaceAll(sql, "@table_name", sysModel.SysMenu{}.TableName())
 	sql = strings.ReplaceAll(sql, "@menus", sysModel.SysBaseMenu{}.TableName())
 	sql = strings.ReplaceAll(sql, "@authorities_menus", joinTableName)
-	if err := global.GVA_DB.Exec(sql).Error; err != nil {
+	if err := db.Exec(sql).Error; err != nil {
 		return ctx, errors.Wrap(err, sysModel.SysMenu{}.TableName()+"视图创建失败!")
 	}
 	return ctx, nil
 }
 
 func (a *initMenuViewPg) TableCreated(ctx context.Context) bool {
-	err1 := global.GVA_DB.Find(&[]sysModel.SysMenu{}).Error
+	db, ok := ctx.Value("db").(*gorm.DB)
+	if !ok {
+		return false
+	}
+	err1 := db.Find(&[]sysModel.SysMenu{}).Error
 	err2 := errors.New(fmt.Sprintf("Error 1146: Table '%v.%v' doesn't exist",
 		global.GVA_CONFIG.Pgsql.Dbname, sysModel.SysMenu{}.TableName()))
 	if errors.As(err1, &err2) {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ func (i *initMenu) MigrateTable(ctx context.Context) (context.Context, error) {`
`29`	`29`	`return ctx, db.AutoMigrate(`
`30`	`30`	`&SysBaseMenu{},`
`31`	`31`	`&SysBaseMenuParameter{},`
`32`		`- &Meta{},`
`33`	`32`	`&SysBaseMenuBtn{},`
`34`	`33`	`)`
`35`	`34`	`}`
`@@ -41,7 +40,6 @@ func (i *initMenu) TableCreated(ctx context.Context) bool {`
`41`	`40`	`}`
`42`	`41`	`m := db.Migrator()`
`43`	`42`	`return m.HasTable(&SysBaseMenu{}) &&`
`44`		`- m.HasTable(&Meta{}) &&`
`45`	`43`	`m.HasTable(&SysBaseMenuParameter{}) &&`
`46`	`44`	`m.HasTable(&SysBaseMenuBtn{})`
`47`	`45`	`}`