sundynix/sundynix-micro-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: rbac完善，file接入完成

Browse Source
This commit is contained in:
Blizzard
2026-05-01 12:56:08 +08:00
parent bbd3f834b9
commit a93477ea8e
81 changed files with 5470 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/system/api/internal/handler/role/assignRoleMenusHandler.go
+29
View File
@@ -0,0 +1,29 @@
package role
import (
"net/http"
"sundynix-micro-go/app/system/api/internal/logic/role"
"sundynix-micro-go/app/system/api/internal/svc"
"sundynix-micro-go/app/system/api/internal/types"
"sundynix-micro-go/common/response"
"github.com/zeromicro/go-zero/rest/httpx"
)
func AssignRoleMenusHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AssignRoleMenusReq
if err := httpx.Parse(r, &req); err != nil {
response.Fail(w, err.Error())
return
}
l := role.NewAssignRoleMenusLogic(r.Context(), svcCtx)
err := l.AssignRoleMenus(&req)
if err != nil {
response.Fail(w, err.Error())
} else {
response.Ok(w)
}
}
}
app/system/api/internal/handler/role/getRoleDetailHandler.go
+33
View File
@@ -0,0 +1,33 @@
// Code scaffolded by goctl. Safe to edit.
// goctl 1.10.1
package role
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"sundynix-micro-go/app/system/api/internal/logic/role"
"sundynix-micro-go/app/system/api/internal/svc"
"sundynix-micro-go/app/system/api/internal/types"
"sundynix-micro-go/common/response"
)
// 角色详情（含已授权菜单）
func GetRoleDetailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.IdQueryReq
if err := httpx.Parse(r, &req); err != nil {
response.Fail(w, err.Error())
return
}
l := role.NewGetRoleDetailLogic(r.Context(), svcCtx)
resp, err := l.GetRoleDetail(&req)
if err != nil {
response.Fail(w, err.Error())
} else {
response.OkWithData(w, resp)
}
}
}
app/system/api/internal/handler/routes.go
+24
View File
@@ -138,6 +138,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
server.AddRoutes(
[]rest.Route{
{
// 角色授权菜单
Method: http.MethodPost,
Path: "/role/assignMenus",
Handler: role.AssignRoleMenusHandler(serverCtx),
},
{
// 创建角色
Method: http.MethodPost,
@@ -150,6 +156,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/role/delete",
Handler: role.DeleteRoleHandler(serverCtx),
},
{
// 角色详情（含已授权菜单）
Method: http.MethodGet,
Path: "/role/detail",
Handler: role.GetRoleDetailHandler(serverCtx),
},
{
// 角色列表
Method: http.MethodPost,
@@ -169,6 +181,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
server.AddRoutes(
[]rest.Route{
{
// 用户授权角色
Method: http.MethodPost,
Path: "/user/assignRoles",
Handler: user.AssignUserRolesHandler(serverCtx),
},
{
// 创建用户
Method: http.MethodPost,
@@ -181,6 +199,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/user/delete",
Handler: user.DeleteUserHandler(serverCtx),
},
{
// 用户详情（含角色信息）
Method: http.MethodGet,
Path: "/user/detail",
Handler: user.GetUserDetailHandler(serverCtx),
},
{
// 用户列表
Method: http.MethodPost,
app/system/api/internal/handler/user/assignUserRolesHandler.go
+29
View File
@@ -0,0 +1,29 @@
package user
import (
"net/http"
"sundynix-micro-go/app/system/api/internal/logic/user"
"sundynix-micro-go/app/system/api/internal/svc"
"sundynix-micro-go/app/system/api/internal/types"
"sundynix-micro-go/common/response"
"github.com/zeromicro/go-zero/rest/httpx"
)
func AssignUserRolesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AssignUserRolesReq
if err := httpx.Parse(r, &req); err != nil {
response.Fail(w, err.Error())
return
}
l := user.NewAssignUserRolesLogic(r.Context(), svcCtx)
err := l.AssignUserRoles(&req)
if err != nil {
response.Fail(w, err.Error())
} else {
response.Ok(w)
}
}
}
app/system/api/internal/handler/user/getUserDetailHandler.go
+33
View File
@@ -0,0 +1,33 @@
// Code scaffolded by goctl. Safe to edit.
// goctl 1.10.1
package user
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"sundynix-micro-go/app/system/api/internal/logic/user"
"sundynix-micro-go/app/system/api/internal/svc"
"sundynix-micro-go/app/system/api/internal/types"
"sundynix-micro-go/common/response"
)
// 用户详情（含角色信息）
func GetUserDetailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.IdQueryReq
if err := httpx.Parse(r, &req); err != nil {
response.Fail(w, err.Error())
return
}
l := user.NewGetUserDetailLogic(r.Context(), svcCtx)
resp, err := l.GetUserDetail(&req)
if err != nil {
response.Fail(w, err.Error())
} else {
response.OkWithData(w, resp)
}
}
}
app/system/api/internal/logic/role/assignRoleMenusLogic.go
+29
View File
@@ -0,0 +1,29 @@
package role
import (
"context"
"sundynix-micro-go/app/system/api/internal/svc"
"sundynix-micro-go/app/system/api/internal/types"
"sundynix-micro-go/app/system/rpc/system"
"github.com/zeromicro/go-zero/core/logx"
)
type AssignRoleMenusLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewAssignRoleMenusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AssignRoleMenusLogic {
return &AssignRoleMenusLogic{Logger: logx.WithContext(ctx), ctx: ctx, svcCtx: svcCtx}
}
func (l *AssignRoleMenusLogic) AssignRoleMenus(req *types.AssignRoleMenusReq) error {
_, err := l.svcCtx.SystemRpc.AssignRoleMenus(l.ctx, &system.AssignRoleMenusReq{
RoleId: req.RoleId,
MenuIds: req.MenuIds,
})
return err
}
app/system/api/internal/logic/role/getRoleDetailLogic.go
+46
View File
@@ -0,0 +1,46 @@
// Code scaffolded by goctl. Safe to edit.
// goctl 1.10.1
package role
import (
"context"
"sundynix-micro-go/app/system/api/internal/svc"
"sundynix-micro-go/app/system/api/internal/types"
"sundynix-micro-go/app/system/rpc/system"
"github.com/zeromicro/go-zero/core/logx"
)
type GetRoleDetailLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
// 角色详情（含已授权菜单）
func NewGetRoleDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRoleDetailLogic {
return &GetRoleDetailLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *GetRoleDetailLogic) GetRoleDetail(req *types.IdQueryReq) (resp *types.RoleDetailResp, err error) {
rpcResp, err := l.svcCtx.SystemRpc.GetRoleDetail(l.ctx, &system.GetRoleDetailReq{
Id: req.Id,
})
if err != nil {
return nil, err
}
return &types.RoleDetailResp{
Id: rpcResp.Id,
Name: rpcResp.Name,
Code: rpcResp.Code,
Sort: int(rpcResp.Sort),
MenuIds: rpcResp.MenuIds,
}, nil
}
app/system/api/internal/logic/role/updateRoleLogic.go
+1 -1
View File
@@ -20,7 +20,7 @@ func NewUpdateRoleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Update
func (l *UpdateRoleLogic) UpdateRole(req *types.RoleUpdateReq) error {
_, err := l.svcCtx.SystemRpc.UpdateRole(l.ctx, &system.RoleUpdateReq{
Id: req.Id, Name: req.Name, Code: req.Code, Sort: int32(req.Sort), MenuIds: req.MenuIds,
Id: req.Id, Name: req.Name, Code: req.Code, Sort: int32(req.Sort),
})
return err
}
app/system/api/internal/logic/user/assignUserRolesLogic.go
+29
View File
@@ -0,0 +1,29 @@
package user
import (
"context"
"sundynix-micro-go/app/system/api/internal/svc"
"sundynix-micro-go/app/system/api/internal/types"
"sundynix-micro-go/app/system/rpc/system"
"github.com/zeromicro/go-zero/core/logx"
)
type AssignUserRolesLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewAssignUserRolesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AssignUserRolesLogic {
return &AssignUserRolesLogic{Logger: logx.WithContext(ctx), ctx: ctx, svcCtx: svcCtx}
}
func (l *AssignUserRolesLogic) AssignUserRoles(req *types.AssignUserRolesReq) error {
_, err := l.svcCtx.SystemRpc.AssignUserRoles(l.ctx, &system.AssignUserRolesReq{
UserId: req.UserId,
RoleIds: req.RoleIds,
})
return err
}
app/system/api/internal/logic/user/createUserLogic.go
+11 -1
View File
@@ -21,11 +21,21 @@ func NewCreateUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Create
}
func (l *CreateUserLogic) CreateUser(req *types.UserCreateReq) error {
_, err := l.svcCtx.SystemRpc.CreateUser(l.ctx, &system.CreateUserReq{
resp, err := l.svcCtx.SystemRpc.CreateUser(l.ctx, &system.CreateUserReq{
Name: req.Name,
Account: req.Account,
Password: req.Password,
Phone: req.Phone,
})
if err != nil {
return err
}
// 创建完成后立即绑定角色
if len(req.RoleIds) > 0 && resp != nil {
_, err = l.svcCtx.SystemRpc.AssignUserRoles(l.ctx, &system.AssignUserRolesReq{
UserId: resp.User.Id,
RoleIds: req.RoleIds,
})
}
return err
}
app/system/api/internal/logic/user/getUserDetailLogic.go
+47
View File
@@ -0,0 +1,47 @@
// Code scaffolded by goctl. Safe to edit.
// goctl 1.10.1
package user
import (
"context"
"sundynix-micro-go/app/system/api/internal/svc"
"sundynix-micro-go/app/system/api/internal/types"
"sundynix-micro-go/app/system/rpc/system"
"github.com/zeromicro/go-zero/core/logx"
)
type GetUserDetailLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
// 用户详情（含角色信息）
func NewGetUserDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserDetailLogic {
return &GetUserDetailLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *GetUserDetailLogic) GetUserDetail(req *types.IdQueryReq) (resp *types.UserDetailResp, err error) {
rpcResp, err := l.svcCtx.SystemRpc.GetUserDetail(l.ctx, &system.GetUserDetailReq{
Id: req.Id,
})
if err != nil {
return nil, err
}
return &types.UserDetailResp{
Id: rpcResp.Id,
Name: rpcResp.Name,
Account: rpcResp.Account,
NickName: rpcResp.NickName,
Phone: rpcResp.Phone,
RoleIds: rpcResp.RoleIds,
}, nil
}
app/system/api/internal/logic/user/getUserListLogic.go
+10
View File
@@ -32,6 +32,15 @@ func (l *GetUserListLogic) GetUserList(req *types.UserListReq) (resp interface{}
}
var list []map[string]interface{}
for _, u := range rpcResp.List {
var roles []map[string]interface{}
for _, r := range u.Roles {
roles = append(roles, map[string]interface{}{
"id": r.Id,
"name": r.Name,
"code": r.Code,
})
}
list = append(list, map[string]interface{}{
"id": u.Id,
"name": u.Name,
@@ -40,6 +49,7 @@ func (l *GetUserListLogic) GetUserList(req *types.UserListReq) (resp interface{}
"phone": u.Phone,
"gender": u.Gender,
"createdAt": u.CreatedAt,
"roles": roles,
})
}
return map[string]interface{}{"list": list, "total": rpcResp.Total}, nil
app/system/api/internal/types/types.go
+40 -11
View File
@@ -3,6 +3,16 @@
package types
type AssignRoleMenusReq struct {
RoleId string `json:"roleId"`
MenuIds []string `json:"menuIds"`
}
type AssignUserRolesReq struct {
UserId string `json:"userId"`
RoleIds []string `json:"roleIds"`
}
type ClientListReq struct {
Current int `json:"current,optional"`
PageSize int `json:"pageSize,optional"`
@@ -49,6 +59,10 @@ type DictUpdateReq struct {
Desc string `json:"desc,optional"`
}
type IdQueryReq struct {
Id string `form:"id"`
}
type IdReq struct {
Id string `json:"id"`
}
@@ -103,6 +117,14 @@ type ResetPasswordReq struct {
Password string `json:"password"`
}
type RoleDetailResp struct {
Id string `json:"id"`
Name string `json:"name"`
Code string `json:"code"`
Sort int `json:"sort"`
MenuIds []string `json:"menuIds"`
}
type RoleListReq struct {
Current int `json:"current,optional"`
PageSize int `json:"pageSize,optional"`
@@ -117,11 +139,10 @@ type RoleReq struct {
}
type RoleUpdateReq struct {
Id string `json:"id"`
Name string `json:"name,optional"`
Code string `json:"code,optional"`
Sort int `json:"sort,optional"`
MenuIds []string `json:"menuIds,optional"`
Id string `json:"id"`
Name string `json:"name,optional"`
Code string `json:"code,optional"`
Sort int `json:"sort,optional"`
}
type UserCreateReq struct {
@@ -133,6 +154,15 @@ type UserCreateReq struct {
RoleIds []string `json:"roleIds,optional"`
}
type UserDetailResp struct {
Id string `json:"id"`
Name string `json:"name"`
Account string `json:"account"`
NickName string `json:"nickName"`
Phone string `json:"phone"`
RoleIds []string `json:"roleIds"`
}
type UserListReq struct {
Current int `json:"current,optional"`
PageSize int `json:"pageSize,optional"`
@@ -141,10 +171,9 @@ type UserListReq struct {
}
type UserUpdateReq struct {
Id string `json:"id"`
Name string `json:"name,optional"`
Account string `json:"account,optional"`
Phone string `json:"phone,optional"`
NickName string `json:"nickName,optional"`
RoleIds []string `json:"roleIds,optional"`
Id string `json:"id"`
Name string `json:"name,optional"`
Account string `json:"account,optional"`
Phone string `json:"phone,optional"`
NickName string `json:"nickName,optional"`
}
app/system/api/system.api
+51 -11
View File
@@ -12,6 +12,9 @@ type (
IdReq {
Id string `json:"id"`
}
IdQueryReq {
Id string `form:"id"`
}
IdsReq {
Ids []string `json:"ids"`
}
@@ -49,17 +52,27 @@ type (
MenuIds []string `json:"menuIds,optional"`
}
RoleUpdateReq {
Id string `json:"id"`
Name string `json:"name,optional"`
Code string `json:"code,optional"`
Sort int `json:"sort,optional"`
MenuIds []string `json:"menuIds,optional"`
Id string `json:"id"`
Name string `json:"name,optional"`
Code string `json:"code,optional"`
Sort int `json:"sort,optional"`
}
RoleListReq {
Current int `json:"current,optional"`
PageSize int `json:"pageSize,optional"`
Name string `json:"name,optional"`
}
RoleDetailResp {
Id string `json:"id"`
Name string `json:"name"`
Code string `json:"code"`
Sort int `json:"sort"`
MenuIds []string `json:"menuIds"`
}
AssignRoleMenusReq {
RoleId string `json:"roleId"`
MenuIds []string `json:"menuIds"`
}
// ---------- 菜单 ----------
MenuReq {
ParentId string `json:"parentId,optional"`
@@ -125,12 +138,11 @@ type (
RoleIds []string `json:"roleIds,optional"`
}
UserUpdateReq {
Id string `json:"id"`
Name string `json:"name,optional"`
Account string `json:"account,optional"`
Phone string `json:"phone,optional"`
NickName string `json:"nickName,optional"`
RoleIds []string `json:"roleIds,optional"`
Id string `json:"id"`
Name string `json:"name,optional"`
Account string `json:"account,optional"`
Phone string `json:"phone,optional"`
NickName string `json:"nickName,optional"`
}
UserListReq {
Current int `json:"current,optional"`
@@ -138,10 +150,22 @@ type (
Name string `json:"name,optional"`
Account string `json:"account,optional"`
}
UserDetailResp {
Id string `json:"id"`
Name string `json:"name"`
Account string `json:"account"`
NickName string `json:"nickName"`
Phone string `json:"phone"`
RoleIds []string `json:"roleIds"`
}
ResetPasswordReq {
Id string `json:"id"`
Password string `json:"password"`
}
AssignUserRolesReq {
UserId string `json:"userId"`
RoleIds []string `json:"roleIds"`
}
)
// ========== 需要鉴权的接口 ==========
@@ -189,6 +213,14 @@ service system-api {
@doc "角色列表"
@handler GetRoleList
post /role/list (RoleListReq)
@doc "角色详情（含已授权菜单）"
@handler GetRoleDetail
get /role/detail (IdQueryReq) returns (RoleDetailResp)
@doc "角色授权菜单"
@handler AssignRoleMenus
post /role/assignMenus (AssignRoleMenusReq)
}
@server (
@@ -266,6 +298,10 @@ service system-api {
@handler GetUserList
post /user/list (UserListReq)
@doc "用户详情（含角色信息）"
@handler GetUserDetail
get /user/detail (IdQueryReq) returns (UserDetailResp)
@doc "创建用户"
@handler CreateUser
post /user/create (UserCreateReq)
@@ -281,5 +317,9 @@ service system-api {
@doc "重置密码"
@handler ResetPassword
post /user/resetPassword (ResetPasswordReq)
@doc "用户授权角色"
@handler AssignUserRoles
post /user/assignRoles (AssignUserRolesReq)
}
app/system/model/system_model.go
+3 -1
View File
@@ -25,7 +25,7 @@ type SundynixRole struct {
Name string `gorm:"size:20;column:name" json:"name"`
Code string `gorm:"size:20;column:code" json:"code"`
Sort int `gorm:"column:sort" json:"sort"`
Menus []*SundynixMenu `gorm:"many2many:sundynix_role_menu;" json:"menus"`
Menus []*SundynixMenu `gorm:"many2many:sundynix_role_menu;joinForeignKey:role_id;joinReferences:menu_id" json:"menus"`
}
func (SundynixRole) TableName() string {
@@ -114,6 +114,8 @@ type SundynixUser struct {
Gender int `gorm:"default:0;column:gender" json:"gender"`
LastLoginIP string `gorm:"size:20;column:last_login_ip" json:"lastLoginIp"`
LastLoginAt *time.Time `gorm:"column:last_login_at" json:"lastLoginAt"`
Roles []*SundynixRole `gorm:"many2many:sundynix_user_role;joinForeignKey:user_id;joinReferences:role_id" json:"roles"`
}
func (SundynixUser) TableName() string {
app/system/rpc/internal/logic/assignRoleMenusLogic.go
+44
View File
@@ -0,0 +1,44 @@
package logic
import (
"context"
"fmt"
sysModel "sundynix-micro-go/app/system/model"
"sundynix-micro-go/app/system/rpc/internal/svc"
"sundynix-micro-go/app/system/rpc/system"
"github.com/zeromicro/go-zero/core/logx"
"gorm.io/gorm"
)
type AssignRoleMenusLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
}
func NewAssignRoleMenusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AssignRoleMenusLogic {
return &AssignRoleMenusLogic{ctx: ctx, svcCtx: svcCtx, Logger: logx.WithContext(ctx)}
}
// AssignRoleMenus 给角色授权菜单（全量替换）
func (l *AssignRoleMenusLogic) AssignRoleMenus(in *system.AssignRoleMenusReq) (*system.CommonResp, error) {
err := l.svcCtx.DB.Transaction(func(tx *gorm.DB) error {
// 先清除旧的菜单关联
if err := tx.Where("role_id = ?", in.RoleId).Delete(&sysModel.SundynixRoleMenu{}).Error; err != nil {
return fmt.Errorf("清除菜单关联失败: %w", err)
}
// 重新批量写入
for _, mid := range in.MenuIds {
if err := tx.Create(&sysModel.SundynixRoleMenu{RoleID: in.RoleId, MenuID: mid}).Error; err != nil {
return fmt.Errorf("关联菜单失败: %w", err)
}
}
return nil
})
if err != nil {
return nil, err
}
return &system.CommonResp{Code: 200, Msg: "success"}, nil
}
app/system/rpc/internal/logic/assignUserRolesLogic.go
+44
View File
@@ -0,0 +1,44 @@
package logic
import (
"context"
"fmt"
sysModel "sundynix-micro-go/app/system/model"
"sundynix-micro-go/app/system/rpc/internal/svc"
"sundynix-micro-go/app/system/rpc/system"
"github.com/zeromicro/go-zero/core/logx"
"gorm.io/gorm"
)
type AssignUserRolesLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
}
func NewAssignUserRolesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AssignUserRolesLogic {
return &AssignUserRolesLogic{ctx: ctx, svcCtx: svcCtx, Logger: logx.WithContext(ctx)}
}
// AssignUserRoles 给用户授权角色（全量替换）
func (l *AssignUserRolesLogic) AssignUserRoles(in *system.AssignUserRolesReq) (*system.CommonResp, error) {
err := l.svcCtx.DB.Transaction(func(tx *gorm.DB) error {
// 先清除旧的角色关联
if err := tx.Where("user_id = ?", in.UserId).Delete(&sysModel.SundynixUserRole{}).Error; err != nil {
return fmt.Errorf("清除角色关联失败: %w", err)
}
// 重新批量写入
for _, rid := range in.RoleIds {
if err := tx.Create(&sysModel.SundynixUserRole{UserID: in.UserId, RoleID: rid}).Error; err != nil {
return fmt.Errorf("关联角色失败: %w", err)
}
}
return nil
})
if err != nil {
return nil, err
}
return &system.CommonResp{Code: 200, Msg: "success"}, nil
}
app/system/rpc/internal/logic/createRoleLogic.go
-1
View File
@@ -28,7 +28,6 @@ func (l *CreateRoleLogic) CreateRole(in *system.RoleReq) (*system.CommonResp, er
if err := tx.Create(&role).Error; err != nil {
return fmt.Errorf("创建角色失败: %w", err)
}
// 关联菜单
for _, mid := range in.MenuIds {
if err := tx.Create(&sysModel.SundynixRoleMenu{RoleID: role.ID, MenuID: mid}).Error; err != nil {
return fmt.Errorf("关联菜单失败: %w", err)
app/system/rpc/internal/logic/getRoleDetailLogic.go
+46
View File
@@ -0,0 +1,46 @@
package logic
import (
"context"
"fmt"
sysModel "sundynix-micro-go/app/system/model"
"sundynix-micro-go/app/system/rpc/internal/svc"
"sundynix-micro-go/app/system/rpc/system"
"github.com/zeromicro/go-zero/core/logx"
)
type GetRoleDetailLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
}
func NewGetRoleDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRoleDetailLogic {
return &GetRoleDetailLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
}
}
func (l *GetRoleDetailLogic) GetRoleDetail(in *system.GetRoleDetailReq) (*system.RoleDetailResp, error) {
var role sysModel.SundynixRole
if err := l.svcCtx.DB.Preload("Menus").Where("id = ?", in.Id).First(&role).Error; err != nil {
return nil, fmt.Errorf("获取角色详情失败: %w", err)
}
var menuIds []string
for _, menu := range role.Menus {
menuIds = append(menuIds, menu.ID)
}
return &system.RoleDetailResp{
Id: role.ID,
Name: role.Name,
Code: role.Code,
Sort: int32(role.Sort),
MenuIds: menuIds,
}, nil
}
app/system/rpc/internal/logic/getRoleListLogic.go
+7 -1
View File
@@ -39,7 +39,13 @@ func (l *GetRoleListLogic) GetRoleList(in *system.RoleListReq) (*system.RoleList
}
var items []*system.RoleInfo
for _, r := range list {
items = append(items, &system.RoleInfo{Id: r.ID, Name: r.Name, Code: r.Code, Sort: int32(r.Sort)})
items = append(items, &system.RoleInfo{
Id: r.ID,
Name: r.Name,
Code: r.Code,
Sort: int32(r.Sort),
CreatedAt: r.CreatedAt.Unix(),
})
}
return &system.RoleListResp{List: items, Total: total}, nil
}
app/system/rpc/internal/logic/getUserDetailLogic.go
+47
View File
@@ -0,0 +1,47 @@
package logic
import (
"context"
"fmt"
sysModel "sundynix-micro-go/app/system/model"
"sundynix-micro-go/app/system/rpc/internal/svc"
"sundynix-micro-go/app/system/rpc/system"
"github.com/zeromicro/go-zero/core/logx"
)
type GetUserDetailLogic struct {
ctx context.Context
svcCtx *svc.ServiceContext
logx.Logger
}
func NewGetUserDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserDetailLogic {
return &GetUserDetailLogic{
ctx: ctx,
svcCtx: svcCtx,
Logger: logx.WithContext(ctx),
}
}
func (l *GetUserDetailLogic) GetUserDetail(in *system.GetUserDetailReq) (*system.UserDetailResp, error) {
var user sysModel.SundynixUser
if err := l.svcCtx.DB.Preload("Roles").Where("id = ?", in.Id).First(&user).Error; err != nil {
return nil, fmt.Errorf("获取用户详情失败: %w", err)
}
var roleIds []string
for _, role := range user.Roles {
roleIds = append(roleIds, role.ID)
}
return &system.UserDetailResp{
Id: user.ID,
Name: user.Name,
Account: user.Account,
NickName: user.NickName,
Phone: user.Phone,
RoleIds: roleIds,
}, nil
}
app/system/rpc/internal/logic/getUserListLogic.go
+1 -1
View File
@@ -41,7 +41,7 @@ func (l *GetUserListLogic) GetUserList(in *system.GetUserListReq) (*system.GetUs
if current <= 0 {
current = 1
}
db.Offset((current - 1) * pageSize).Limit(pageSize).Order("created_at DESC").Find(&list)
db.Preload("Roles").Offset((current - 1) * pageSize).Limit(pageSize).Order("created_at DESC").Find(&list)
var protoList []*system.UserInfo
for _, u := range list {
app/system/rpc/internal/logic/updateRoleLogic.go
+4 -21
View File
@@ -9,7 +9,6 @@ import (
"sundynix-micro-go/app/system/rpc/system"
"github.com/zeromicro/go-zero/core/logx"
"gorm.io/gorm"
)
type UpdateRoleLogic struct {
@@ -23,26 +22,10 @@ func NewUpdateRoleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Update
}
func (l *UpdateRoleLogic) UpdateRole(in *system.RoleUpdateReq) (*system.CommonResp, error) {
err := l.svcCtx.DB.Transaction(func(tx *gorm.DB) error {
if err := tx.Model(&sysModel.SundynixRole{}).Where("id = ?", in.Id).Updates(map[string]interface{}{
"name": in.Name, "code": in.Code, "sort": in.Sort,
}).Error; err != nil {
return fmt.Errorf("更新角色失败: %w", err)
}
// 先删除旧的菜单关联
if err := tx.Where("role_id = ?", in.Id).Delete(&sysModel.SundynixRoleMenu{}).Error; err != nil {
return fmt.Errorf("清除菜单关联失败: %w", err)
}
// 重新关联菜单
for _, mid := range in.MenuIds {
if err := tx.Create(&sysModel.SundynixRoleMenu{RoleID: in.Id, MenuID: mid}).Error; err != nil {
return fmt.Errorf("关联菜单失败: %w", err)
}
}
return nil
})
if err != nil {
return nil, err
if err := l.svcCtx.DB.Model(&sysModel.SundynixRole{}).Where("id = ?", in.Id).Updates(map[string]interface{}{
"name": in.Name, "code": in.Code, "sort": in.Sort,
}).Error; err != nil {
return nil, fmt.Errorf("更新角色失败: %w", err)
}
return &system.CommonResp{Code: 200, Msg: "success"}, nil
}
app/system/rpc/internal/logic/userHelper.go
+10
View File
@@ -27,5 +27,15 @@ func convertUserToProto(u *sysModel.SundynixUser) *system.UserInfo {
if u.LastLoginAt != nil {
info.LastLoginAt = u.LastLoginAt.Unix()
}
for _, r := range u.Roles {
info.Roles = append(info.Roles, &system.RoleInfo{
Id: r.ID,
Name: r.Name,
Code: r.Code,
Sort: int32(r.Sort),
})
}
return info
}
app/system/rpc/internal/server/systemServiceServer.go
+21
View File
@@ -54,6 +54,11 @@ func (s *SystemServiceServer) GetUserList(ctx context.Context, in *system.GetUse
return l.GetUserList(in)
}
func (s *SystemServiceServer) GetUserDetail(ctx context.Context, in *system.GetUserDetailReq) (*system.UserDetailResp, error) {
l := logic.NewGetUserDetailLogic(ctx, s.svcCtx)
return l.GetUserDetail(in)
}
func (s *SystemServiceServer) DeleteUser(ctx context.Context, in *system.DeleteUserReq) (*system.CommonResp, error) {
l := logic.NewDeleteUserLogic(ctx, s.svcCtx)
return l.DeleteUser(in)
@@ -90,6 +95,22 @@ func (s *SystemServiceServer) GetRoleList(ctx context.Context, in *system.RoleLi
return l.GetRoleList(in)
}
func (s *SystemServiceServer) GetRoleDetail(ctx context.Context, in *system.GetRoleDetailReq) (*system.RoleDetailResp, error) {
l := logic.NewGetRoleDetailLogic(ctx, s.svcCtx)
return l.GetRoleDetail(in)
}
func (s *SystemServiceServer) AssignRoleMenus(ctx context.Context, in *system.AssignRoleMenusReq) (*system.CommonResp, error) {
l := logic.NewAssignRoleMenusLogic(ctx, s.svcCtx)
return l.AssignRoleMenus(in)
}
// --- RBAC 用户授权 ---
func (s *SystemServiceServer) AssignUserRoles(ctx context.Context, in *system.AssignUserRolesReq) (*system.CommonResp, error) {
l := logic.NewAssignUserRolesLogic(ctx, s.svcCtx)
return l.AssignUserRoles(in)
}
// --- 菜单 ---
func (s *SystemServiceServer) GetMenusByRoleId(ctx context.Context, in *system.GetMenusByRoleIdReq) (*system.GetMenusByRoleIdResp, error) {
l := logic.NewGetMenusByRoleIdLogic(ctx, s.svcCtx)
app/system/rpc/internal/task/clean_oper_log.go
+39
View File
@@ -0,0 +1,39 @@
package task
import (
"context"
"time"
"github.com/zeromicro/go-zero/core/logx"
"sundynix-micro-go/app/system/rpc/internal/svc"
)
// CleanOperLogJob 定义清理操作日志的定时任务
type CleanOperLogJob struct {
svcCtx *svc.ServiceContext
}
func NewCleanOperLogJob(svcCtx *svc.ServiceContext) *CleanOperLogJob {
return &CleanOperLogJob{
svcCtx: svcCtx,
}
}
func (j *CleanOperLogJob) Run() {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
defer cancel()
logx.WithContext(ctx).Infof("[CRON] 开始执行定时清理操作日志任务")
// 删除 3 天前的日志
threeDaysAgo := time.Now().AddDate(0, 0, -3)
// 执行硬删除
res := j.svcCtx.DB.WithContext(ctx).Exec("DELETE FROM sundynix_operation_record WHERE created_at < ?", threeDaysAgo)
if res.Error != nil {
logx.WithContext(ctx).Errorf("[CRON] 清理操作日志失败: %v", res.Error)
return
}
logx.WithContext(ctx).Infof("[CRON] 定时清理操作日志完成，共删除了 %d 条数据", res.RowsAffected)
}
app/system/rpc/pb/system.proto
+44 -1
View File
@@ -27,6 +27,7 @@ message RoleInfo {
string code = 3;
int32 sort = 4;
repeated string menuIds = 5;
int64 createdAt = 6;
}
message RoleReq {
@@ -41,7 +42,17 @@ message RoleUpdateReq {
string name = 2;
string code = 3;
int32 sort = 4;
repeated string menuIds = 5;
}
// RBAC 授权
message AssignRoleMenusReq {
string roleId = 1;
repeated string menuIds = 2;
}
message AssignUserRolesReq {
string userId = 1;
repeated string roleIds = 2;
}
message RoleListReq {
@@ -55,6 +66,18 @@ message RoleListResp {
int64 total = 2;
}
message GetRoleDetailReq {
string id = 1;
}
message RoleDetailResp {
string id = 1;
string name = 2;
string code = 3;
int32 sort = 4;
repeated string menuIds = 5;
}
// ========== 菜单 ==========
message MenuInfo {
@@ -253,6 +276,7 @@ message UserInfo {
int64 createdAt = 22;
int64 updatedAt = 23;
string avatarUrl = 24;
repeated RoleInfo roles = 25;
}
message GetUserByIdReq {
@@ -315,6 +339,19 @@ message GetUserListResp {
int64 total = 2;
}
message GetUserDetailReq {
string id = 1;
}
message UserDetailResp {
string id = 1;
string name = 2;
string account = 3;
string nickName = 4;
string phone = 5;
repeated string roleIds = 6;
}
message DeleteUserReq {
repeated string ids = 1;
}
@@ -360,6 +397,7 @@ service SystemService {
rpc CreateUser(CreateUserReq) returns (CreateUserResp);
rpc UpdateUser(UpdateUserReq) returns (CommonResp);
rpc GetUserList(GetUserListReq) returns (GetUserListResp);
rpc GetUserDetail(GetUserDetailReq) returns (UserDetailResp);
rpc DeleteUser(DeleteUserReq) returns (CommonResp);
rpc ResetPassword(ResetPasswordReq) returns (CommonResp);
@@ -369,6 +407,11 @@ service SystemService {
rpc UpdateRole(RoleUpdateReq) returns (CommonResp);
rpc DeleteRole(IdsReq) returns (CommonResp);
rpc GetRoleList(RoleListReq) returns (RoleListResp);
rpc GetRoleDetail(GetRoleDetailReq) returns (RoleDetailResp);
rpc AssignRoleMenus(AssignRoleMenusReq) returns (CommonResp);
// --- RBAC 用户授权 ---
rpc AssignUserRoles(AssignUserRolesReq) returns (CommonResp);
// --- 菜单 ---
rpc GetMenusByRoleId(GetMenusByRoleIdReq) returns (GetMenusByRoleIdResp);
app/system/rpc/system.go
+16
View File
@@ -7,9 +7,12 @@ import (
"sundynix-micro-go/app/system/rpc/internal/config"
"sundynix-micro-go/app/system/rpc/internal/server"
"sundynix-micro-go/app/system/rpc/internal/svc"
"sundynix-micro-go/app/system/rpc/internal/task"
"sundynix-micro-go/app/system/rpc/system"
"sundynix-micro-go/common/utils/timer"
"github.com/zeromicro/go-zero/core/conf"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/service"
"github.com/zeromicro/go-zero/core/stat"
"github.com/zeromicro/go-zero/zrpc"
@@ -36,6 +39,19 @@ func main() {
})
defer s.Stop()
// 初始化定时任务系统
cronTimer := timer.NewTimerTask()
defer cronTimer.Close()
// 注册定时清理操作日志任务 (每天凌晨 3:00 执行)
cleanJob := task.NewCleanOperLogJob(ctx)
_, err := cronTimer.AddTaskByJob("systemCron", "0 3 * * *", cleanJob, "cleanOperLogTask")
if err != nil {
logx.Errorf("❌ 注册定时清理操作日志任务失败: %v", err)
} else {
logx.Infof("✅ 注册定时清理操作日志任务成功 (每天凌晨3点)")
}
fmt.Printf("Starting rpc server at %s...\n", c.ListenOn)
s.Start()
}
app/system/rpc/system/system.pb.go
+658 -254
View File
File diff suppressed because it is too large Load Diff
app/system/rpc/system/system_grpc.pb.go
+154
View File
@@ -25,6 +25,7 @@ const (
SystemService_CreateUser_FullMethodName = "/system.SystemService/CreateUser"
SystemService_UpdateUser_FullMethodName = "/system.SystemService/UpdateUser"
SystemService_GetUserList_FullMethodName = "/system.SystemService/GetUserList"
SystemService_GetUserDetail_FullMethodName = "/system.SystemService/GetUserDetail"
SystemService_DeleteUser_FullMethodName = "/system.SystemService/DeleteUser"
SystemService_ResetPassword_FullMethodName = "/system.SystemService/ResetPassword"
SystemService_GetRolesByUserId_FullMethodName = "/system.SystemService/GetRolesByUserId"
@@ -32,6 +33,9 @@ const (
SystemService_UpdateRole_FullMethodName = "/system.SystemService/UpdateRole"
SystemService_DeleteRole_FullMethodName = "/system.SystemService/DeleteRole"
SystemService_GetRoleList_FullMethodName = "/system.SystemService/GetRoleList"
SystemService_GetRoleDetail_FullMethodName = "/system.SystemService/GetRoleDetail"
SystemService_AssignRoleMenus_FullMethodName = "/system.SystemService/AssignRoleMenus"
SystemService_AssignUserRoles_FullMethodName = "/system.SystemService/AssignUserRoles"
SystemService_GetMenusByRoleId_FullMethodName = "/system.SystemService/GetMenusByRoleId"
SystemService_CreateMenu_FullMethodName = "/system.SystemService/CreateMenu"
SystemService_UpdateMenu_FullMethodName = "/system.SystemService/UpdateMenu"
@@ -62,6 +66,7 @@ type SystemServiceClient interface {
CreateUser(ctx context.Context, in *CreateUserReq, opts ...grpc.CallOption) (*CreateUserResp, error)
UpdateUser(ctx context.Context, in *UpdateUserReq, opts ...grpc.CallOption) (*CommonResp, error)
GetUserList(ctx context.Context, in *GetUserListReq, opts ...grpc.CallOption) (*GetUserListResp, error)
GetUserDetail(ctx context.Context, in *GetUserDetailReq, opts ...grpc.CallOption) (*UserDetailResp, error)
DeleteUser(ctx context.Context, in *DeleteUserReq, opts ...grpc.CallOption) (*CommonResp, error)
ResetPassword(ctx context.Context, in *ResetPasswordReq, opts ...grpc.CallOption) (*CommonResp, error)
// --- 角色 ---
@@ -70,6 +75,10 @@ type SystemServiceClient interface {
UpdateRole(ctx context.Context, in *RoleUpdateReq, opts ...grpc.CallOption) (*CommonResp, error)
DeleteRole(ctx context.Context, in *IdsReq, opts ...grpc.CallOption) (*CommonResp, error)
GetRoleList(ctx context.Context, in *RoleListReq, opts ...grpc.CallOption) (*RoleListResp, error)
GetRoleDetail(ctx context.Context, in *GetRoleDetailReq, opts ...grpc.CallOption) (*RoleDetailResp, error)
AssignRoleMenus(ctx context.Context, in *AssignRoleMenusReq, opts ...grpc.CallOption) (*CommonResp, error)
// --- RBAC 用户授权 ---
AssignUserRoles(ctx context.Context, in *AssignUserRolesReq, opts ...grpc.CallOption) (*CommonResp, error)
// --- 菜单 ---
GetMenusByRoleId(ctx context.Context, in *GetMenusByRoleIdReq, opts ...grpc.CallOption) (*GetMenusByRoleIdResp, error)
CreateMenu(ctx context.Context, in *MenuReq, opts ...grpc.CallOption) (*CommonResp, error)
@@ -161,6 +170,16 @@ func (c *systemServiceClient) GetUserList(ctx context.Context, in *GetUserListRe
return out, nil
}
func (c *systemServiceClient) GetUserDetail(ctx context.Context, in *GetUserDetailReq, opts ...grpc.CallOption) (*UserDetailResp, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(UserDetailResp)
err := c.cc.Invoke(ctx, SystemService_GetUserDetail_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *systemServiceClient) DeleteUser(ctx context.Context, in *DeleteUserReq, opts ...grpc.CallOption) (*CommonResp, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(CommonResp)
@@ -231,6 +250,36 @@ func (c *systemServiceClient) GetRoleList(ctx context.Context, in *RoleListReq,
return out, nil
}
func (c *systemServiceClient) GetRoleDetail(ctx context.Context, in *GetRoleDetailReq, opts ...grpc.CallOption) (*RoleDetailResp, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(RoleDetailResp)
err := c.cc.Invoke(ctx, SystemService_GetRoleDetail_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *systemServiceClient) AssignRoleMenus(ctx context.Context, in *AssignRoleMenusReq, opts ...grpc.CallOption) (*CommonResp, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(CommonResp)
err := c.cc.Invoke(ctx, SystemService_AssignRoleMenus_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *systemServiceClient) AssignUserRoles(ctx context.Context, in *AssignUserRolesReq, opts ...grpc.CallOption) (*CommonResp, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(CommonResp)
err := c.cc.Invoke(ctx, SystemService_AssignUserRoles_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *systemServiceClient) GetMenusByRoleId(ctx context.Context, in *GetMenusByRoleIdReq, opts ...grpc.CallOption) (*GetMenusByRoleIdResp, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(GetMenusByRoleIdResp)
@@ -412,6 +461,7 @@ type SystemServiceServer interface {
CreateUser(context.Context, *CreateUserReq) (*CreateUserResp, error)
UpdateUser(context.Context, *UpdateUserReq) (*CommonResp, error)
GetUserList(context.Context, *GetUserListReq) (*GetUserListResp, error)
GetUserDetail(context.Context, *GetUserDetailReq) (*UserDetailResp, error)
DeleteUser(context.Context, *DeleteUserReq) (*CommonResp, error)
ResetPassword(context.Context, *ResetPasswordReq) (*CommonResp, error)
// --- 角色 ---
@@ -420,6 +470,10 @@ type SystemServiceServer interface {
UpdateRole(context.Context, *RoleUpdateReq) (*CommonResp, error)
DeleteRole(context.Context, *IdsReq) (*CommonResp, error)
GetRoleList(context.Context, *RoleListReq) (*RoleListResp, error)
GetRoleDetail(context.Context, *GetRoleDetailReq) (*RoleDetailResp, error)
AssignRoleMenus(context.Context, *AssignRoleMenusReq) (*CommonResp, error)
// --- RBAC 用户授权 ---
AssignUserRoles(context.Context, *AssignUserRolesReq) (*CommonResp, error)
// --- 菜单 ---
GetMenusByRoleId(context.Context, *GetMenusByRoleIdReq) (*GetMenusByRoleIdResp, error)
CreateMenu(context.Context, *MenuReq) (*CommonResp, error)
@@ -469,6 +523,9 @@ func (UnimplementedSystemServiceServer) UpdateUser(context.Context, *UpdateUserR
func (UnimplementedSystemServiceServer) GetUserList(context.Context, *GetUserListReq) (*GetUserListResp, error) {
return nil, status.Error(codes.Unimplemented, "method GetUserList not implemented")
}
func (UnimplementedSystemServiceServer) GetUserDetail(context.Context, *GetUserDetailReq) (*UserDetailResp, error) {
return nil, status.Error(codes.Unimplemented, "method GetUserDetail not implemented")
}
func (UnimplementedSystemServiceServer) DeleteUser(context.Context, *DeleteUserReq) (*CommonResp, error) {
return nil, status.Error(codes.Unimplemented, "method DeleteUser not implemented")
}
@@ -490,6 +547,15 @@ func (UnimplementedSystemServiceServer) DeleteRole(context.Context, *IdsReq) (*C
func (UnimplementedSystemServiceServer) GetRoleList(context.Context, *RoleListReq) (*RoleListResp, error) {
return nil, status.Error(codes.Unimplemented, "method GetRoleList not implemented")
}
func (UnimplementedSystemServiceServer) GetRoleDetail(context.Context, *GetRoleDetailReq) (*RoleDetailResp, error) {
return nil, status.Error(codes.Unimplemented, "method GetRoleDetail not implemented")
}
func (UnimplementedSystemServiceServer) AssignRoleMenus(context.Context, *AssignRoleMenusReq) (*CommonResp, error) {
return nil, status.Error(codes.Unimplemented, "method AssignRoleMenus not implemented")
}
func (UnimplementedSystemServiceServer) AssignUserRoles(context.Context, *AssignUserRolesReq) (*CommonResp, error) {
return nil, status.Error(codes.Unimplemented, "method AssignUserRoles not implemented")
}
func (UnimplementedSystemServiceServer) GetMenusByRoleId(context.Context, *GetMenusByRoleIdReq) (*GetMenusByRoleIdResp, error) {
return nil, status.Error(codes.Unimplemented, "method GetMenusByRoleId not implemented")
}
@@ -670,6 +736,24 @@ func _SystemService_GetUserList_Handler(srv interface{}, ctx context.Context, de
return interceptor(ctx, in, info, handler)
}
func _SystemService_GetUserDetail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(GetUserDetailReq)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(SystemServiceServer).GetUserDetail(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: SystemService_GetUserDetail_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SystemServiceServer).GetUserDetail(ctx, req.(*GetUserDetailReq))
}
return interceptor(ctx, in, info, handler)
}
func _SystemService_DeleteUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(DeleteUserReq)
if err := dec(in); err != nil {
@@ -796,6 +880,60 @@ func _SystemService_GetRoleList_Handler(srv interface{}, ctx context.Context, de
return interceptor(ctx, in, info, handler)
}
func _SystemService_GetRoleDetail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(GetRoleDetailReq)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(SystemServiceServer).GetRoleDetail(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: SystemService_GetRoleDetail_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SystemServiceServer).GetRoleDetail(ctx, req.(*GetRoleDetailReq))
}
return interceptor(ctx, in, info, handler)
}
func _SystemService_AssignRoleMenus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(AssignRoleMenusReq)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(SystemServiceServer).AssignRoleMenus(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: SystemService_AssignRoleMenus_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SystemServiceServer).AssignRoleMenus(ctx, req.(*AssignRoleMenusReq))
}
return interceptor(ctx, in, info, handler)
}
func _SystemService_AssignUserRoles_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(AssignUserRolesReq)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(SystemServiceServer).AssignUserRoles(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: SystemService_AssignUserRoles_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(SystemServiceServer).AssignUserRoles(ctx, req.(*AssignUserRolesReq))
}
return interceptor(ctx, in, info, handler)
}
func _SystemService_GetMenusByRoleId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(GetMenusByRoleIdReq)
if err := dec(in); err != nil {
@@ -1133,6 +1271,10 @@ var SystemService_ServiceDesc = grpc.ServiceDesc{
MethodName: "GetUserList",
Handler: _SystemService_GetUserList_Handler,
},
{
MethodName: "GetUserDetail",
Handler: _SystemService_GetUserDetail_Handler,
},
{
MethodName: "DeleteUser",
Handler: _SystemService_DeleteUser_Handler,
@@ -1161,6 +1303,18 @@ var SystemService_ServiceDesc = grpc.ServiceDesc{
MethodName: "GetRoleList",
Handler: _SystemService_GetRoleList_Handler,
},
{
MethodName: "GetRoleDetail",
Handler: _SystemService_GetRoleDetail_Handler,
},
{
MethodName: "AssignRoleMenus",
Handler: _SystemService_AssignRoleMenus_Handler,
},
{
MethodName: "AssignUserRoles",
Handler: _SystemService_AssignUserRoles_Handler,
},
{
MethodName: "GetMenusByRoleId",
Handler: _SystemService_GetMenusByRoleId_Handler,
app/system/rpc/systemservice/systemService.go
+34
View File
@@ -14,6 +14,8 @@ import (
)
type (
AssignRoleMenusReq = system.AssignRoleMenusReq
AssignUserRolesReq = system.AssignUserRolesReq
ClientInfo = system.ClientInfo
ClientListReq = system.ClientListReq
ClientListResp = system.ClientListResp
@@ -33,12 +35,16 @@ type (
GetClientByIdResp = system.GetClientByIdResp
GetMenusByRoleIdReq = system.GetMenusByRoleIdReq
GetMenusByRoleIdResp = system.GetMenusByRoleIdResp
GetRoleDetailReq = system.GetRoleDetailReq
GetRoleListReq = system.RoleListReq
GetRoleListResp = system.RoleListResp
GetRolesByUserIdReq = system.GetRolesByUserIdReq
GetRolesByUserIdResp = system.GetRolesByUserIdResp
GetUserByIdReq = system.GetUserByIdReq
GetUserByIdResp = system.GetUserByIdResp
GetUserByOpenIdReq = system.GetUserByOpenIdReq
GetUserByOpenIdResp = system.GetUserByOpenIdResp
GetUserDetailReq = system.GetUserDetailReq
GetUserListReq = system.GetUserListReq
GetUserListResp = system.GetUserListResp
IdReq = system.IdReq
@@ -53,12 +59,14 @@ type (
OperationRecordListReq = system.OperationRecordListReq
OperationRecordListResp = system.OperationRecordListResp
ResetPasswordReq = system.ResetPasswordReq
RoleDetailResp = system.RoleDetailResp
RoleInfo = system.RoleInfo
RoleListReq = system.RoleListReq
RoleListResp = system.RoleListResp
RoleReq = system.RoleReq
RoleUpdateReq = system.RoleUpdateReq
UpdateUserReq = system.UpdateUserReq
UserDetailResp = system.UserDetailResp
UserInfo = system.UserInfo
SystemService interface {
@@ -69,6 +77,7 @@ type (
CreateUser(ctx context.Context, in *CreateUserReq, opts ...grpc.CallOption) (*CreateUserResp, error)
UpdateUser(ctx context.Context, in *UpdateUserReq, opts ...grpc.CallOption) (*CommonResp, error)
GetUserList(ctx context.Context, in *GetUserListReq, opts ...grpc.CallOption) (*GetUserListResp, error)
GetUserDetail(ctx context.Context, in *GetUserDetailReq, opts ...grpc.CallOption) (*UserDetailResp, error)
DeleteUser(ctx context.Context, in *DeleteUserReq, opts ...grpc.CallOption) (*CommonResp, error)
ResetPassword(ctx context.Context, in *ResetPasswordReq, opts ...grpc.CallOption) (*CommonResp, error)
// --- 角色 ---
@@ -77,6 +86,10 @@ type (
UpdateRole(ctx context.Context, in *RoleUpdateReq, opts ...grpc.CallOption) (*CommonResp, error)
DeleteRole(ctx context.Context, in *IdsReq, opts ...grpc.CallOption) (*CommonResp, error)
GetRoleList(ctx context.Context, in *RoleListReq, opts ...grpc.CallOption) (*RoleListResp, error)
GetRoleDetail(ctx context.Context, in *GetRoleDetailReq, opts ...grpc.CallOption) (*RoleDetailResp, error)
AssignRoleMenus(ctx context.Context, in *AssignRoleMenusReq, opts ...grpc.CallOption) (*CommonResp, error)
// --- RBAC 用户授权 ---
AssignUserRoles(ctx context.Context, in *AssignUserRolesReq, opts ...grpc.CallOption) (*CommonResp, error)
// --- 菜单 ---
GetMenusByRoleId(ctx context.Context, in *GetMenusByRoleIdReq, opts ...grpc.CallOption) (*GetMenusByRoleIdResp, error)
CreateMenu(ctx context.Context, in *MenuReq, opts ...grpc.CallOption) (*CommonResp, error)
@@ -142,6 +155,11 @@ func (m *defaultSystemService) GetUserList(ctx context.Context, in *GetUserListR
return client.GetUserList(ctx, in, opts...)
}
func (m *defaultSystemService) GetUserDetail(ctx context.Context, in *GetUserDetailReq, opts ...grpc.CallOption) (*UserDetailResp, error) {
client := system.NewSystemServiceClient(m.cli.Conn())
return client.GetUserDetail(ctx, in, opts...)
}
func (m *defaultSystemService) DeleteUser(ctx context.Context, in *DeleteUserReq, opts ...grpc.CallOption) (*CommonResp, error) {
client := system.NewSystemServiceClient(m.cli.Conn())
return client.DeleteUser(ctx, in, opts...)
@@ -178,6 +196,22 @@ func (m *defaultSystemService) GetRoleList(ctx context.Context, in *RoleListReq,
return client.GetRoleList(ctx, in, opts...)
}
func (m *defaultSystemService) GetRoleDetail(ctx context.Context, in *GetRoleDetailReq, opts ...grpc.CallOption) (*RoleDetailResp, error) {
client := system.NewSystemServiceClient(m.cli.Conn())
return client.GetRoleDetail(ctx, in, opts...)
}
func (m *defaultSystemService) AssignRoleMenus(ctx context.Context, in *AssignRoleMenusReq, opts ...grpc.CallOption) (*CommonResp, error) {
client := system.NewSystemServiceClient(m.cli.Conn())
return client.AssignRoleMenus(ctx, in, opts...)
}
// --- RBAC 用户授权 ---
func (m *defaultSystemService) AssignUserRoles(ctx context.Context, in *AssignUserRolesReq, opts ...grpc.CallOption) (*CommonResp, error) {
client := system.NewSystemServiceClient(m.cli.Conn())
return client.AssignUserRoles(ctx, in, opts...)
}
// --- 菜单 ---
func (m *defaultSystemService) GetMenusByRoleId(ctx context.Context, in *GetMenusByRoleIdReq, opts ...grpc.CallOption) (*GetMenusByRoleIdResp, error) {
client := system.NewSystemServiceClient(m.cli.Conn())