更新文档,修复新增菜单的name重复问题,修复sys_user注册,删除更新记录与casb RBAC RESTFUL测试,多余数据的删除

This commit is contained in:
SliverHorn
2020-08-31 16:05:26 +08:00
parent db0bddf1d4
commit ccdb695c06
10 changed files with 71 additions and 132 deletions
+3 -4
View File
@@ -4,6 +4,7 @@ import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gorm.io/gorm"
"strconv"
)
@@ -94,12 +95,10 @@ func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.Sys
// 增加基础路由
func AddBaseMenu(menu model.SysBaseMenu) (err error) {
findOne := global.GVA_DB.Where("name = ?", menu.Name).Find(&model.SysBaseMenu{}).Error
if findOne != nil {
err = global.GVA_DB.Create(&menu).Error
} else {
if !errors.Is(global.GVA_DB.Where("name = ?", menu.Name).First(&model.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
err = errors.New("存在重复name,请修改name")
}
err = global.GVA_DB.Create(&menu).Error
return err
}
-11
View File
@@ -39,17 +39,6 @@ func DeleteSysOperationRecord(sysOperationRecord model.SysOperationRecord) (err
return err
}
// @title UpdateSysOperationRecord
// @description update a SysOperationRecord
// @param sysOperationRecord *model.SysOperationRecord
// @auth 2020/04/05 20:22
// @return error
func UpdateSysOperationRecord(sysOperationRecord *model.SysOperationRecord) (err error) {
err = global.GVA_DB.Save(sysOperationRecord).Error
return err
}
// @title GetSysOperationRecord
// @description get the info of a SysOperationRecord
// @auth 2020/04/05 20:22
+5 -9
View File
@@ -19,17 +19,13 @@ import (
func Register(u model.SysUser) (err error, userInter model.SysUser) {
var user model.SysUser
// 判断用户名是否注册
notRegister := errors.Is(global.GVA_DB.Where("username = ?", u.Username).First(&user).Error, gorm.ErrRecordNotFound)
// notRegister为false表明读取到了 不能注册
if !notRegister {
if !errors.Is(global.GVA_DB.Where("username = ?", u.Username).First(&user).Error, gorm.ErrRecordNotFound){ // 判断用户名是否注册
return errors.New("用户名已注册"), userInter
} else {
// 否则 附加uuid 密码md5简单加密 注册
u.Password = utils.MD5V([]byte(u.Password))
u.UUID = uuid.NewV4()
err = global.GVA_DB.Create(&u).Error
}
// 否则 附加uuid 密码md5简单加密 注册
u.Password = utils.MD5V([]byte(u.Password))
u.UUID = uuid.NewV4()
err = global.GVA_DB.Create(&u).Error
return err, u
}