feat: 发布权限 RBAC + PipelineEditor 修复 + 菜单优化
- 新增 DeployRBAC 页面: Jenkins-style Item Role 权限管理 - 正则匹配流水线 code,实时命中预览 - 内置用户分配面板,无需跳转系统管理 - 支持创建/编辑/删除/启用禁用 Item Role - 修复 PipelineEditor 成员管理 http 双解包 bug - 修复 PipelineManager 前端 code 路由迁移(delete/trigger/stop/loadRuns) - 新增批量删除流水线运行记录 API - Sidebar: 应用发布下新增「发布权限」, 仓库认证→发布配置, 移除用户组 - 恢复系统管理菜单(不受发布权限改动影响) - 后端 ItemRole CRUD handler + 正则匹配中间件已就绪
This commit is contained in:
1 parent
0fea0ccc20
commit
24f955832e
40 files changed
+7530
-1032
No files matched your search
@@ -0,0 +1,201 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"ezops/internal/models"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// ItemRoleHandler Item Role handler (Jenkins-style regex pipeline matching)
|
||||
type ItemRoleHandler struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
// NewItemRoleHandler creates a new ItemRoleHandler
|
||||
func NewItemRoleHandler(db *gorm.DB) *ItemRoleHandler {
|
||||
return &ItemRoleHandler{db: db}
|
||||
}
|
||||
|
||||
// ListItemRoles GET /admin/item-roles
|
||||
func (h *ItemRoleHandler) ListItemRoles(c *gin.Context) {
|
||||
var roles []models.ItemRole
|
||||
h.db.Order("created_at DESC").Find(&roles)
|
||||
c.JSON(http.StatusOK, models.Response{
|
||||
Code: 200,
|
||||
Data: models.ListResponse{List: roles, Total: int64(len(roles))},
|
||||
})
|
||||
}
|
||||
|
||||
// CreateItemRole POST /admin/item-roles
|
||||
func (h *ItemRoleHandler) CreateItemRole(c *gin.Context) {
|
||||
var req models.CreateItemRoleRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "请求参数错误: " + err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// 唯一性校验
|
||||
var existing models.ItemRole
|
||||
if err := h.db.Where("name = ? OR code = ?", req.Name, req.Code).First(&existing).Error; err == nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "Item Role 名称或编码已存在"})
|
||||
return
|
||||
}
|
||||
|
||||
role := models.ItemRole{
|
||||
Name: req.Name,
|
||||
Code: req.Code,
|
||||
Pattern: req.Pattern,
|
||||
Role: req.Role,
|
||||
Description: req.Description,
|
||||
Status: 1,
|
||||
}
|
||||
if err := h.db.Create(&role).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, models.Response{Code: 500, Message: "创建失败"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, models.Response{Code: 200, Message: "创建成功", Data: role})
|
||||
}
|
||||
|
||||
// UpdateItemRole PUT /admin/item-roles/:id
|
||||
func (h *ItemRoleHandler) UpdateItemRole(c *gin.Context) {
|
||||
id, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "无效的 ID"})
|
||||
return
|
||||
}
|
||||
|
||||
var req models.UpdateItemRoleRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "请求参数错误: " + err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
var role models.ItemRole
|
||||
if err := h.db.First(&role, id).Error; err != nil {
|
||||
c.JSON(http.StatusNotFound, models.Response{Code: 404, Message: "Item Role 不存在"})
|
||||
return
|
||||
}
|
||||
|
||||
updates := map[string]interface{}{}
|
||||
if req.Name != "" {
|
||||
updates["name"] = req.Name
|
||||
}
|
||||
if req.Code != "" {
|
||||
updates["code"] = req.Code
|
||||
}
|
||||
if req.Pattern != "" {
|
||||
updates["pattern"] = req.Pattern
|
||||
}
|
||||
if req.Role != "" {
|
||||
updates["role"] = req.Role
|
||||
}
|
||||
if req.Description != "" {
|
||||
updates["description"] = req.Description
|
||||
}
|
||||
if req.Status != nil {
|
||||
updates["status"] = *req.Status
|
||||
}
|
||||
|
||||
if len(updates) > 0 {
|
||||
if err := h.db.Model(&role).Updates(updates).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, models.Response{Code: 500, Message: "更新失败"})
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
h.db.First(&role, id)
|
||||
c.JSON(http.StatusOK, models.Response{Code: 200, Message: "更新成功", Data: role})
|
||||
}
|
||||
|
||||
// DeleteItemRole DELETE /admin/item-roles/:id
|
||||
func (h *ItemRoleHandler) DeleteItemRole(c *gin.Context) {
|
||||
id, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "无效的 ID"})
|
||||
return
|
||||
}
|
||||
|
||||
// Clean up user associations first
|
||||
h.db.Where("item_role_id = ?", id).Delete(&models.UserItemRole{})
|
||||
if err := h.db.Delete(&models.ItemRole{}, id).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, models.Response{Code: 500, Message: "删除失败"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, models.Response{Code: 200, Message: "删除成功"})
|
||||
}
|
||||
|
||||
// ListUserItemRoles GET /admin/users/:id/item-roles
|
||||
func (h *ItemRoleHandler) ListUserItemRoles(c *gin.Context) {
|
||||
userID, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "无效的用户 ID"})
|
||||
return
|
||||
}
|
||||
|
||||
var assignments []models.UserItemRole
|
||||
h.db.Preload("ItemRole").Where("user_id = ?", userID).Find(&assignments)
|
||||
c.JSON(http.StatusOK, models.Response{
|
||||
Code: 200,
|
||||
Data: models.ListResponse{List: assignments, Total: int64(len(assignments))},
|
||||
})
|
||||
}
|
||||
|
||||
// AssignItemRole POST /admin/users/:id/item-roles
|
||||
func (h *ItemRoleHandler) AssignItemRole(c *gin.Context) {
|
||||
userID, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "无效的用户 ID"})
|
||||
return
|
||||
}
|
||||
|
||||
var req models.AssignItemRoleRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "请求参数错误: " + err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// Check if already assigned
|
||||
var existing models.UserItemRole
|
||||
if err := h.db.Where("user_id = ? AND item_role_id = ?", userID, req.ItemRoleID).First(&existing).Error; err == nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "该用户已拥有此 Item Role"})
|
||||
return
|
||||
}
|
||||
|
||||
assignment := models.UserItemRole{
|
||||
UserID: uint(userID),
|
||||
ItemRoleID: req.ItemRoleID,
|
||||
}
|
||||
if err := h.db.Create(&assignment).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, models.Response{Code: 500, Message: "分配失败"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, models.Response{Code: 200, Message: "分配成功", Data: assignment})
|
||||
}
|
||||
|
||||
// RemoveItemRole DELETE /admin/users/:id/item-roles/:roleId
|
||||
func (h *ItemRoleHandler) RemoveItemRole(c *gin.Context) {
|
||||
userID, err := strconv.Atoi(c.Param("id"))
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "无效的用户 ID"})
|
||||
return
|
||||
}
|
||||
roleID, err := strconv.Atoi(c.Param("roleId"))
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.Response{Code: 400, Message: "无效的 Role ID"})
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.db.Where("user_id = ? AND item_role_id = ?", uint(userID), roleID).Delete(&models.UserItemRole{}).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, models.Response{Code: 500, Message: "移除失败"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, models.Response{Code: 200, Message: "移除成功"})
|
||||
}
|
||||
Reference in new issue
Block a user