Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhangwenjian committed 2022-08-08 18:03:04 +08:00
commit 56968c0bd2
2 files changed
+49 -1

No files matched your search

@@ -17,7 +17,7 @@ func init() {
func _1599190683659Tables(db *gorm.DB, version string) error {
return db.Transaction(func(tx *gorm.DB) error {
err := tx.Set("gorm:table_options", "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ").Migrator().AutoMigrate(
err := tx.Set("gorm:table_options", "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4").Migrator().AutoMigrate(
new(models.CasbinRule),
new(models.SysDept),
new(models.SysConfig),
@@ -0,0 +1,48 @@
package version
import (
"go-admin/cmd/migrate/migration/models"
common "go-admin/common/models"
"gorm.io/gorm"
"runtime"
"strconv"
"go-admin/cmd/migrate/migration"
)
func init() {
_, fileName, _, _ := runtime.Caller(0)
migration.Migrate.SetVersion(migration.GetFilename(fileName), _1653638869132Test)
}
func _1653638869132Test(db *gorm.DB, version string) error {
return db.Transaction(func(tx *gorm.DB) error {
var list []models.SysMenu
err := tx.Model(&models.SysMenu{}).Order("parent_id,menu_id").Find(&list).Error
if err != nil {
return err
}
for _, v := range list {
if v.ParentId == 0 {
v.Paths = "/0/" + strconv.Itoa(v.MenuId)
} else {
var e models.SysMenu
err = tx.Model(&models.SysMenu{}).Where("menu_id=?", v.ParentId).First(&e).Error
if err != nil {
if err == gorm.ErrRecordNotFound {
continue
}
return err
}
v.Paths = e.Paths + "/" + strconv.Itoa(v.MenuId)
}
err = tx.Model(&v).Update("paths", v.Paths).Error
if err != nil {
return err
}
}
return tx.Create(&common.Migration{
Version: version,
}).Error
})
}