mirror of
https://github.com/flipped-aurora/gin-vue-admin.git
synced 2026-09-21 12:32:25 +00:00
gormv2升级 阶段2
This commit is contained in:
+1
-1
@@ -17,7 +17,7 @@ mysql:
|
||||
config: 'charset=utf8&parseTime=True&loc=Local'
|
||||
max-idle-conns: 10
|
||||
max-open-conns: 10
|
||||
log-mode: true
|
||||
log-mode: false
|
||||
|
||||
#sqlite 配置
|
||||
sqlite:
|
||||
|
||||
@@ -25,7 +25,9 @@ func Mysql() {
|
||||
Logger: logger.Default.LogMode(logger.Info),
|
||||
}
|
||||
} else {
|
||||
gormConfig = &gorm.Config{}
|
||||
gormConfig = &gorm.Config{
|
||||
Logger: logger.Default.LogMode(logger.Silent),
|
||||
}
|
||||
}
|
||||
|
||||
if db, err := gorm.Open(mysql.New(mysqlConfig), gormConfig); err != nil {
|
||||
|
||||
@@ -58,6 +58,7 @@ func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
|
||||
return errors.New("存在相同name修改失败")
|
||||
}
|
||||
}
|
||||
err = global.GVA_DB.Delete(&model.SysBaseMenuParameter{}, "sys_base_menu_id = ?", menu.ID).Error
|
||||
err = db.Updates(upDateMap).Association("Parameters").Replace(menu.Parameters)
|
||||
global.GVA_LOG.Debug("菜单修改时候,关联菜单err:%v", err)
|
||||
return err
|
||||
|
||||
@@ -158,7 +158,7 @@ func AddMenuAuthority(menus []model.SysBaseMenu, authorityId string) (err error)
|
||||
|
||||
func GetMenuAuthority(authorityId string) (err error, menus []model.SysMenu) {
|
||||
//sql := "SELECT authority_menu.keep_alive,authority_menu.default_menu,authority_menu.created_at,authority_menu.updated_at,authority_menu.deleted_at,authority_menu.menu_level,authority_menu.parent_id,authority_menu.path,authority_menu.`name`,authority_menu.hidden,authority_menu.component,authority_menu.title,authority_menu.icon,authority_menu.sort,authority_menu.menu_id,authority_menu.authority_id FROM authority_menu WHERE authority_menu.authority_id = ? ORDER BY authority_menu.sort ASC"
|
||||
err = global.GVA_DB.Order("sort").Find(&menus).Error
|
||||
err = global.GVA_DB.Where("authority_id = ? ", authorityId).Order("sort").Find(&menus).Error
|
||||
//err = global.GVA_DB.Raw(sql, authorityId).Scan(&menus).Error
|
||||
return err, menus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user