feat: RBAC 基本完成
This commit is contained in:
@@ -4,4 +4,5 @@ type ServiceGroup struct {
|
||||
UserService
|
||||
ClientService
|
||||
RoleService
|
||||
MenuService
|
||||
}
|
||||
|
||||
@@ -2,11 +2,12 @@ package system
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"gorm.io/gorm"
|
||||
"sundynix-go/global"
|
||||
common "sundynix-go/model/commom/request"
|
||||
"sundynix-go/model/system"
|
||||
systemReq "sundynix-go/model/system/request"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type ClientService struct{}
|
||||
@@ -44,10 +45,17 @@ func (s *ClientService) GetClientList(info systemReq.GetClientList) (list interf
|
||||
}
|
||||
|
||||
func (s *ClientService) DeleteClientByIds(ids common.IdsReq) (err error) {
|
||||
return global.DB.Delete(&system.Client{}, "id IN ?", ids.Ids).Error
|
||||
return global.DB.Where("id IN (?)", ids.Ids).Delete(&system.Client{}).Error
|
||||
}
|
||||
|
||||
func (s *ClientService) GetClientById(id int) (client system.Client, err error) {
|
||||
err = global.DB.Where("id = ?", id).First(&client).Error
|
||||
return client, err
|
||||
func (s *ClientService) GetClientById(id string) (client *system.Client, err error) {
|
||||
var c system.Client
|
||||
err = global.DB.Where("id = ?", id).First(&c).Error
|
||||
return &c, err
|
||||
}
|
||||
|
||||
func (s *ClientService) GetClientByClientId(clientId string) (client *system.Client, err error) {
|
||||
var c system.Client
|
||||
err = global.DB.Where("client_id = ?", clientId).First(&c).Error
|
||||
return &c, err
|
||||
}
|
||||
|
||||
@@ -0,0 +1,126 @@
|
||||
package system
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"sundynix-go/global"
|
||||
"sundynix-go/model/system"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type MenuService struct{}
|
||||
|
||||
var MenuServiceApp = new(MenuService)
|
||||
|
||||
func (s *MenuService) SaveMenu(menu system.Menu) error {
|
||||
//1.根据code和name查询是否存在重名
|
||||
if err := global.DB.Where("code = ? or name = ?", menu.Code, menu.Name).First(&system.Menu{}).Error; err == nil {
|
||||
return errors.New("菜单已存在")
|
||||
}
|
||||
return global.DB.Create(&menu).Error
|
||||
}
|
||||
|
||||
func (s *MenuService) UpdateMenu(menu *system.Menu) (err error) {
|
||||
var sysMenu system.Menu
|
||||
menuMap := map[string]interface{}{
|
||||
"Category": menu.Category,
|
||||
"Name": menu.Name,
|
||||
"Title": menu.Title,
|
||||
"Code": menu.Code,
|
||||
"Permission": menu.Permission,
|
||||
"Locale": menu.Locale,
|
||||
"Icon": menu.Icon,
|
||||
"Sort": menu.Sort,
|
||||
}
|
||||
err = global.DB.Where("id = ?", menu.Id).First(&sysMenu).Error
|
||||
if err != nil {
|
||||
global.Logger.Debug(err.Error())
|
||||
return errors.New("查询菜单失败")
|
||||
}
|
||||
err = global.DB.Model(&sysMenu).Updates(menuMap).Error
|
||||
return err
|
||||
}
|
||||
|
||||
func (s *MenuService) DeleteMenu(id string) (err error) {
|
||||
err = global.DB.First(&system.Menu{}, "parent_id = ?", id).Error
|
||||
if err == nil {
|
||||
return errors.New("请先删除子菜单")
|
||||
}
|
||||
var menu system.Menu
|
||||
err = global.DB.Where("id = ?", id).First(&menu).Error
|
||||
if err != nil {
|
||||
return errors.New("菜单记录不存在")
|
||||
}
|
||||
// 同步删除menu表和role-menu表数据
|
||||
return global.DB.Transaction(func(tx *gorm.DB) error {
|
||||
if err = tx.Where("id = ?", id).Delete(&system.Menu{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err = tx.Where("menu_id = ?", id).Delete(&system.RoleMenu{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func (s *MenuService) GetMenuById(id string) (menu *system.Menu, err error) {
|
||||
var m system.Menu
|
||||
err = global.DB.Where("id = ?", id).First(&m).Error
|
||||
return &m, err
|
||||
}
|
||||
|
||||
func (s *MenuService) GetAllMenuTree(category int, parentId string) (menus []*system.Menu, err error) {
|
||||
//1,先根据category和parentId获取所有菜单 category默认为0,parentId默认为0
|
||||
//2.讲查询出的列表构建为树结构
|
||||
var menuList []*system.Menu
|
||||
db := global.DB.Model(&system.Menu{})
|
||||
if category != 0 {
|
||||
db.Where("category = ?", category)
|
||||
}
|
||||
if parentId != "0" {
|
||||
db.Where("parent_id = ?", parentId)
|
||||
}
|
||||
err = db.Order("sort asc").Find(&menuList).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
tree := buildMenuTree(menuList)
|
||||
return tree, nil
|
||||
}
|
||||
|
||||
func (s *MenuService) GetUserRoutes(userId string) (menus []*system.Menu, err error) {
|
||||
//1.根据userId 查询角色 根据角色查询菜单 去重
|
||||
//2.构建树结构
|
||||
var roleIds []string
|
||||
err = global.DB.Model(&system.UserRole{}).Where("user_id = ?", userId).Pluck("role_id", &roleIds).Error
|
||||
var menuIds []string
|
||||
err = global.DB.Model(&system.RoleMenu{}).Where("role_id in ?", roleIds).Pluck("menu_id", &menuIds).Error
|
||||
var menuList []*system.Menu
|
||||
err = global.DB.Model(&system.Menu{}).Where("id in ?", menuIds).Find(&menuList).Error
|
||||
return buildMenuTree(menuList), nil
|
||||
}
|
||||
|
||||
func buildMenuTree(list []*system.Menu) []*system.Menu {
|
||||
//1.定义一个map
|
||||
menuMap := make(map[string]*system.Menu)
|
||||
for _, item := range list {
|
||||
menuMap[item.Id] = item
|
||||
}
|
||||
//构建树结构
|
||||
var treeList []*system.Menu
|
||||
for _, item := range list {
|
||||
if item.ParentId == "0" {
|
||||
// 如果没有父节点,直接添加到树中
|
||||
treeList = append(treeList, item)
|
||||
} else {
|
||||
if parent, exists := menuMap[item.ParentId]; exists {
|
||||
// 如果有父节点,将当前节点添加到父节点的Children中
|
||||
parent.Children = append(parent.Children, item)
|
||||
} else {
|
||||
// 如果没有父节点,将当前节点添加到树中
|
||||
treeList = append(treeList, item)
|
||||
}
|
||||
}
|
||||
}
|
||||
return treeList
|
||||
}
|
||||
@@ -2,11 +2,12 @@ package system
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"gorm.io/gorm"
|
||||
"sundynix-go/global"
|
||||
common "sundynix-go/model/commom/request"
|
||||
"sundynix-go/model/system"
|
||||
systemReq "sundynix-go/model/system/request"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type RoleService struct {
|
||||
@@ -48,7 +49,41 @@ func (s *RoleService) DeleteRoleByIds(ids common.IdsReq) error {
|
||||
return global.DB.Where("id in ?", ids.Ids).Delete(&system.Role{}).Error
|
||||
}
|
||||
|
||||
func (s *RoleService) GetRoleById(id int) (role system.Role, err error) {
|
||||
err = global.DB.Where("id = ?", id).First(&role).Error
|
||||
return role, err
|
||||
func (s *RoleService) GetRoleById(id string) (role *system.Role, err error) {
|
||||
var r system.Role
|
||||
err = global.DB.Where("id = ?", id).First(&r).Error
|
||||
return &r, err
|
||||
}
|
||||
|
||||
func (s *RoleService) GrantRole(userId string, roleIds []string) error {
|
||||
//1. 检查是否存在userid的授权记录 存在就删除 不存在就插入
|
||||
//2. 插入新的数据
|
||||
return global.DB.Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.Where("user_id = ?", userId).Delete(&system.UserRole{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, roleId := range roleIds {
|
||||
if err := tx.Create(&system.UserRole{UserId: userId, RoleId: roleId}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
func (s *RoleService) GrantMenu(roleId string, menuIds []string) error {
|
||||
//1. 检查是否存在userid的授权记录 存在就删除 不存在就插入
|
||||
//2. 插入新的数据
|
||||
return global.DB.Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.Where("role_id = ?", roleId).Delete(&system.RoleMenu{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, menuId := range menuIds {
|
||||
if err := tx.Create(&system.RoleMenu{RoleId: roleId, MenuId: menuId}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
@@ -3,9 +3,12 @@ package system
|
||||
import (
|
||||
"errors"
|
||||
"sundynix-go/global"
|
||||
common "sundynix-go/model/commom/request"
|
||||
"sundynix-go/model/system"
|
||||
systemReq "sundynix-go/model/system/request"
|
||||
"sundynix-go/utils"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type UserService struct{}
|
||||
@@ -14,7 +17,8 @@ var UserServiceApp = new(UserService)
|
||||
|
||||
func (userService *UserService) Login(u *system.User) (userInfo *system.User, err error) {
|
||||
var user system.User
|
||||
err = global.DB.Where("account = ?", u.Account).First(&user).Error
|
||||
// 查询出用户信息的同时查询出角色信息
|
||||
err = global.DB.Model(&system.User{}).Preload("Roles").Where("account = ?", u.Account).First(&user).Error
|
||||
if err == nil {
|
||||
if ok := utils.BcryptCheck(u.Password, user.Password); !ok {
|
||||
return nil, errors.New("密码错误")
|
||||
@@ -23,6 +27,29 @@ func (userService *UserService) Login(u *system.User) (userInfo *system.User, er
|
||||
return &user, err
|
||||
}
|
||||
|
||||
func (userService *UserService) SaveUser(user system.User) error {
|
||||
if !errors.Is(global.DB.Where("account = ?", user.Account).First(&system.User{}).Error, gorm.ErrRecordNotFound) {
|
||||
return errors.New("存在重复Account,请修改Account")
|
||||
}
|
||||
user.Password = utils.BcryptHash(user.Password)
|
||||
return global.DB.Create(&user).Error
|
||||
}
|
||||
|
||||
func (userService *UserService) UpdateUser(user *system.User) (err error) {
|
||||
var sysUser system.User
|
||||
userMap := map[string]interface{}{
|
||||
"Account": user.Account,
|
||||
"Phone": user.Phone,
|
||||
}
|
||||
err = global.DB.Where("id = ?", user.Id).First(&sysUser).Error
|
||||
if err != nil {
|
||||
global.Logger.Debug(err.Error())
|
||||
return errors.New("查询用户失败")
|
||||
}
|
||||
err = global.DB.Model(&sysUser).Updates(userMap).Error
|
||||
return err
|
||||
}
|
||||
|
||||
func (userService *UserService) GetUserList(info systemReq.GetUserList) (list interface{}, total int64, err error) {
|
||||
limit := info.PageSize
|
||||
offset := info.PageSize * (info.Current - 1)
|
||||
@@ -42,3 +69,17 @@ func (userService *UserService) GetUserList(info systemReq.GetUserList) (list in
|
||||
err = db.Limit(limit).Offset(offset).Find(&userList).Error
|
||||
return userList, total, err
|
||||
}
|
||||
|
||||
func (userService *UserService) DeleteUserByIds(ids common.IdsReq) error {
|
||||
return global.DB.Where("id IN (?)", ids.Ids).Delete(&system.User{}).Error
|
||||
}
|
||||
|
||||
func (userService *UserService) GetUserById(id string) (user *system.User, err error) {
|
||||
var u system.User
|
||||
err = global.DB.Where("id = ?", id).Preload("Roles").First(&u).Error
|
||||
return &u, err
|
||||
}
|
||||
|
||||
func (userService *UserService) ChangePassword(id string, pwd string) (err error) {
|
||||
return global.DB.Model(&system.User{}).Where("id = ?", id).Update("password", utils.BcryptHash(pwd)).Error
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user