yml/hfb_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成剩余模块 Context 超时控制改造

Browse Source
This commit is contained in:
yml2213
2026-06-10 12:58:59 +08:00
parent d2858c529d
commit 6ae8f0e830
24 changed files with 370 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/adminmgr/handler.go
+7 -7
View File
@@ -22,7 +22,7 @@ func NewHandler(service *Service) *Handler {
func (h *Handler) List(c *gin.Context) {
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
result, err := h.service.List(page, pageSize)
result, err := h.service.List(c.Request.Context(), page, pageSize)
if err != nil {
writeError(c, err)
return
@@ -35,7 +35,7 @@ func (h *Handler) FindByID(c *gin.Context) {
if !ok {
return
}
item, err := h.service.FindByID(id)
item, err := h.service.FindByID(c.Request.Context(), id)
if err != nil {
writeError(c, err)
return
@@ -49,7 +49,7 @@ func (h *Handler) Create(c *gin.Context) {
response.BadRequest(c, "用户名和密码不能为空")
return
}
item, err := h.service.Create(req)
item, err := h.service.Create(c.Request.Context(), req)
if err != nil {
writeError(c, err)
return
@@ -67,7 +67,7 @@ func (h *Handler) Update(c *gin.Context) {
response.BadRequest(c, "请求格式不正确")
return
}
item, err := h.service.Update(id, req)
item, err := h.service.Update(c.Request.Context(), id, req)
if err != nil {
writeError(c, err)
return
@@ -81,7 +81,7 @@ func (h *Handler) Delete(c *gin.Context) {
return
}
currentAdminID, _ := c.Get(middleware.ContextAdminID)
if err := h.service.Delete(id, currentAdminID.(uint64)); err != nil {
if err := h.service.Delete(c.Request.Context(), id, currentAdminID.(uint64)); err != nil {
writeError(c, err)
return
}
@@ -98,7 +98,7 @@ func (h *Handler) AssignRoles(c *gin.Context) {
response.BadRequest(c, "请求格式不正确")
return
}
if err := h.service.AssignRoles(id, req); err != nil {
if err := h.service.AssignRoles(c.Request.Context(), id, req); err != nil {
writeError(c, err)
return
}
@@ -115,7 +115,7 @@ func (h *Handler) ChangePassword(c *gin.Context) {
response.BadRequest(c, "密码不能为空")
return
}
if err := h.service.ChangePassword(id, req); err != nil {
if err := h.service.ChangePassword(c.Request.Context(), id, req); err != nil {
writeError(c, err)
return
}
backend/internal/modules/adminmgr/repository.go
+39 -35
View File
@@ -23,19 +23,20 @@ func NewRepository(db *gorm.DB, redis *redis.Client) *Repository {
return &Repository{db: db, redis: redis}
}
func (r *Repository) List(page, pageSize int) (*PaginatedResult, error) {
func (r *Repository) List(ctx context.Context, page, pageSize int) (*PaginatedResult, error) {
db := r.db.WithContext(ctx)
var total int64
if err := r.db.Model(&model.AdminUser{}).Count(&total).Error; err != nil {
if err := db.Model(&model.AdminUser{}).Count(&total).Error; err != nil {
return nil, err
}
offset := (page - 1) * pageSize
var admins []model.AdminUser
if err := r.db.Order("id DESC").Offset(offset).Limit(pageSize).Find(&admins).Error; err != nil {
if err := db.Order("id DESC").Offset(offset).Limit(pageSize).Find(&admins).Error; err != nil {
return nil, err
}
items := make([]AdminUserDTO, 0, len(admins))
for _, admin := range admins {
roles, _ := r.getAdminRoles(admin.ID)
roles, _ := r.getAdminRoles(ctx, admin.ID)
items = append(items, AdminUserDTO{
ID: admin.ID,
Username: admin.Username,
@@ -50,12 +51,12 @@ func (r *Repository) List(page, pageSize int) (*PaginatedResult, error) {
return &PaginatedResult{Items: items, Total: total, Page: page, PageSize: pageSize}, nil
}
func (r *Repository) FindByID(id uint64) (*AdminUserDTO, error) {
func (r *Repository) FindByID(ctx context.Context, id uint64) (*AdminUserDTO, error) {
var admin model.AdminUser
if err := r.db.First(&admin, id).Error; err != nil {
if err := r.db.WithContext(ctx).First(&admin, id).Error; err != nil {
return nil, err
}
roles, _ := r.getAdminRoles(admin.ID)
roles, _ := r.getAdminRoles(ctx, admin.ID)
dto := AdminUserDTO{
ID: admin.ID,
Username: admin.Username,
@@ -69,7 +70,7 @@ func (r *Repository) FindByID(id uint64) (*AdminUserDTO, error) {
return &dto, nil
}
func (r *Repository) Create(req CreateAdminRequest) (*AdminUserDTO, error) {
func (r *Repository) Create(ctx context.Context, req CreateAdminRequest) (*AdminUserDTO, error) {
hash, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
if err != nil {
return nil, err
@@ -80,15 +81,16 @@ func (r *Repository) Create(req CreateAdminRequest) (*AdminUserDTO, error) {
Nickname: req.Nickname,
Status: "active",
}
if err := r.db.Create(&admin).Error; err != nil {
if err := r.db.WithContext(ctx).Create(&admin).Error; err != nil {
return nil, err
}
return r.FindByID(admin.ID)
return r.FindByID(ctx, admin.ID)
}
func (r *Repository) Update(id uint64, req UpdateAdminRequest) (*AdminUserDTO, error) {
func (r *Repository) Update(ctx context.Context, id uint64, req UpdateAdminRequest) (*AdminUserDTO, error) {
db := r.db.WithContext(ctx)
var admin model.AdminUser
if err := r.db.First(&admin, id).Error; err != nil {
if err := db.First(&admin, id).Error; err != nil {
return nil, err
}
if req.Nickname != "" {
@@ -97,46 +99,48 @@ func (r *Repository) Update(id uint64, req UpdateAdminRequest) (*AdminUserDTO, e
if req.Status != "" {
admin.Status = req.Status
}
if err := r.db.Save(&admin).Error; err != nil {
if err := db.Save(&admin).Error; err != nil {
return nil, err
}
return r.FindByID(id)
return r.FindByID(ctx, id)
}
func (r *Repository) Delete(id uint64, currentAdminID uint64) error {
func (r *Repository) Delete(ctx context.Context, id uint64, currentAdminID uint64) error {
if id == currentAdminID {
return ErrCannotDeleteSelf
}
db := r.db.WithContext(ctx)
var admin model.AdminUser
if err := r.db.First(&admin, id).Error; err != nil {
if err := db.First(&admin, id).Error; err != nil {
return err
}
// 检查是否是最后一个 super_admin
isLastSuper, err := r.isLastSuperAdmin(id)
isLastSuper, err := r.isLastSuperAdmin(ctx, id)
if err != nil {
return err
}
if isLastSuper {
return ErrLastSuperAdmin
}
return r.db.Transaction(func(tx *gorm.DB) error {
return db.Transaction(func(tx *gorm.DB) error {
if err := tx.Where("admin_user_id = ?", id).Delete(&model.AdminUserRole{}).Error; err != nil {
return err
}
if err := tx.Delete(&model.AdminUser{}, id).Error; err != nil {
return err
}
r.invalidatePermCache(id)
r.invalidatePermCache(ctx, id)
return nil
})
}
func (r *Repository) AssignRoles(adminID uint64, roleIDs []uint64) error {
func (r *Repository) AssignRoles(ctx context.Context, adminID uint64, roleIDs []uint64) error {
db := r.db.WithContext(ctx)
var admin model.AdminUser
if err := r.db.First(&admin, adminID).Error; err != nil {
if err := db.First(&admin, adminID).Error; err != nil {
return err
}
err := r.db.Transaction(func(tx *gorm.DB) error {
err := db.Transaction(func(tx *gorm.DB) error {
if err := tx.Where("admin_user_id = ?", adminID).Delete(&model.AdminUserRole{}).Error; err != nil {
return err
}
@@ -151,13 +155,13 @@ func (r *Repository) AssignRoles(adminID uint64, roleIDs []uint64) error {
if err != nil {
return err
}
r.invalidatePermCache(adminID)
r.invalidatePermCache(ctx, adminID)
return nil
}
func (r *Repository) ChangePassword(id uint64, oldPwd, newPwd string) error {
func (r *Repository) ChangePassword(ctx context.Context, id uint64, oldPwd, newPwd string) error {
var admin model.AdminUser
if err := r.db.First(&admin, id).Error; err != nil {
if err := r.db.WithContext(ctx).First(&admin, id).Error; err != nil {
return err
}
if err := bcrypt.CompareHashAndPassword([]byte(admin.PasswordHash), []byte(oldPwd)); err != nil {
@@ -167,12 +171,12 @@ func (r *Repository) ChangePassword(id uint64, oldPwd, newPwd string) error {
if err != nil {
return err
}
return r.db.Model(&admin).Update("password_hash", string(hash)).Error
return r.db.WithContext(ctx).Model(&admin).Update("password_hash", string(hash)).Error
}
func (r *Repository) GetPermissionCodes(adminID uint64) ([]string, error) {
func (r *Repository) GetPermissionCodes(ctx context.Context, adminID uint64) ([]string, error) {
var codes []string
err := r.db.Table("admin_user_roles aur").
err := r.db.WithContext(ctx).Table("admin_user_roles aur").
Select("DISTINCT p.code").
Joins("JOIN role_permissions rp ON rp.role_id = aur.role_id").
Joins("JOIN permissions p ON p.id = rp.permission_id").
@@ -181,9 +185,9 @@ func (r *Repository) GetPermissionCodes(adminID uint64) ([]string, error) {
return codes, err
}
func (r *Repository) getAdminRoles(adminID uint64) ([]adminrole.RoleDTO, error) {
func (r *Repository) getAdminRoles(ctx context.Context, adminID uint64) ([]adminrole.RoleDTO, error) {
var roles []model.Role
err := r.db.Table("roles").
err := r.db.WithContext(ctx).Table("roles").
Joins("JOIN admin_user_roles aur ON aur.role_id = roles.id").
Where("aur.admin_user_id = ?", adminID).
Find(&roles).Error
@@ -199,23 +203,23 @@ func (r *Repository) getAdminRoles(adminID uint64) ([]adminrole.RoleDTO, error)
return result, nil
}
func (r *Repository) isLastSuperAdmin(adminID uint64) (bool, error) {
func (r *Repository) isLastSuperAdmin(ctx context.Context, adminID uint64) (bool, error) {
var superRole model.Role
if err := r.db.Where("code = ?", "super_admin").First(&superRole).Error; err != nil {
db := r.db.WithContext(ctx)
if err := db.Where("code = ?", "super_admin").First(&superRole).Error; err != nil {
return false, nil // 没有 super_admin 角色，不限制
}
var count int64
err := r.db.Model(&model.AdminUserRole{}).
err := db.Model(&model.AdminUserRole{}).
Where("role_id = ? AND admin_user_id != ?", superRole.ID, adminID).
Count(&count).Error
return count == 0, err
}
func (r *Repository) invalidatePermCache(adminID uint64) {
func (r *Repository) invalidatePermCache(ctx context.Context, adminID uint64) {
if r.redis == nil {
return
}
ctx := context.Background()
r.redis.Del(ctx, permCacheKey(adminID))
}
backend/internal/modules/adminmgr/service.go
+18 -15
View File
@@ -1,6 +1,9 @@
package adminmgr
import "errors"
import (
"context"
"errors"
)
var ErrDependencyUnavailable = errors.New("dependency unavailable")
@@ -12,7 +15,7 @@ func NewService(repo *Repository) *Service {
return &Service{repo: repo}
}
func (s *Service) List(page, pageSize int) (*PaginatedResult, error) {
func (s *Service) List(ctx context.Context, page, pageSize int) (*PaginatedResult, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
@@ -22,53 +25,53 @@ func (s *Service) List(page, pageSize int) (*PaginatedResult, error) {
if pageSize < 1 || pageSize > 100 {
pageSize = 20
}
return s.repo.List(page, pageSize)
return s.repo.List(ctx, page, pageSize)
}
func (s *Service) FindByID(id uint64) (*AdminUserDTO, error) {
func (s *Service) FindByID(ctx context.Context, id uint64) (*AdminUserDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
return s.repo.FindByID(id)
return s.repo.FindByID(ctx, id)
}
func (s *Service) Create(req CreateAdminRequest) (*AdminUserDTO, error) {
func (s *Service) Create(ctx context.Context, req CreateAdminRequest) (*AdminUserDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
if len(req.Password) < 6 {
return nil, errors.New("password too short")
}
return s.repo.Create(req)
return s.repo.Create(ctx, req)
}
func (s *Service) Update(id uint64, req UpdateAdminRequest) (*AdminUserDTO, error) {
func (s *Service) Update(ctx context.Context, id uint64, req UpdateAdminRequest) (*AdminUserDTO, error) {
if s.repo == nil {
return nil, ErrDependencyUnavailable
}
return s.repo.Update(id, req)
return s.repo.Update(ctx, id, req)
}
func (s *Service) Delete(id uint64, currentAdminID uint64) error {
func (s *Service) Delete(ctx context.Context, id uint64, currentAdminID uint64) error {
if s.repo == nil {
return ErrDependencyUnavailable
}
return s.repo.Delete(id, currentAdminID)
return s.repo.Delete(ctx, id, currentAdminID)
}
func (s *Service) AssignRoles(adminID uint64, req AssignRolesRequest) error {
func (s *Service) AssignRoles(ctx context.Context, adminID uint64, req AssignRolesRequest) error {
if s.repo == nil {
return ErrDependencyUnavailable
}
return s.repo.AssignRoles(adminID, req.RoleIDs)
return s.repo.AssignRoles(ctx, adminID, req.RoleIDs)
}
func (s *Service) ChangePassword(id uint64, req ChangePasswordRequest) error {
func (s *Service) ChangePassword(ctx context.Context, id uint64, req ChangePasswordRequest) error {
if s.repo == nil {
return ErrDependencyUnavailable
}
if len(req.NewPassword) < 6 {
return errors.New("new password too short")
}
return s.repo.ChangePassword(id, req.OldPassword, req.NewPassword)
return s.repo.ChangePassword(ctx, id, req.OldPassword, req.NewPassword)
}