一些小修复 (#1085)

* chore: 去掉初始化中误加的额外表

* chore: 修复初始化不应使用的GVA_DB

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{})
 }

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)

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) {