更新

go/internal/handler/menu_handler.go

@@ -6,6 +6,7 @@ import (
 	"photowall/internal/service"
 	"photowall/pkg/response"
 	"strconv"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 )
@@ -29,14 +30,14 @@ func (h *MenuHandler) GetUserMenus(c *gin.Context) {
 	response.OK(c, tree)
 }
 
-// GetAll GET /api/admin/menus 获取所有菜单（管理用）
+// GetAll GET /api/admin/menus 获取所有菜单树结构（管理用）
 func (h *MenuHandler) GetAll(c *gin.Context) {
-	list, err := h.menu.GetAll()
+	tree, err := h.menu.GetAllTree()
 	if err != nil {
-		response.Internal(c, "获取菜单失败")
+		response.Internal(c, "获取菜单失败: "+err.Error())
 		return
 	}
-	response.OK(c, list)
+	response.OK(c, tree)
 }
 
 // Create POST /api/admin/menus 创建菜单
@@ -46,34 +47,59 @@ func (h *MenuHandler) Create(c *gin.Context) {
 		response.BadRequest(c, "参数错误："+err.Error())
 		return
 	}
+	if strings.TrimSpace(m.Name) == "" {
+		response.BadRequest(c, "路由名称(name)不能为空")
+		return
+	}
+	if strings.TrimSpace(m.Title) == "" {
+		response.BadRequest(c, "菜单标题(title)不能为空")
+		return
+	}
 	if err := h.menu.Create(&m); err != nil {
-		response.Internal(c, "创建菜单失败")
+		response.Internal(c, "创建菜单失败: "+err.Error())
 		return
 	}
 	response.Created(c, m)
 }
 
-// Update PUT /api/admin/menus/:id 更新菜单
+// Update PUT /api/admin/menus/:id 更新菜单（支持全量或部分字段更新）
 func (h *MenuHandler) Update(c *gin.Context) {
-	id, _ := strconv.Atoi(c.Param("id"))
-	var m model.Menu
-	if err := c.ShouldBindJSON(&m); err != nil {
+	id, err := strconv.ParseUint(c.Param("id"), 10, 64)
+	if err != nil || id == 0 {
+		response.BadRequest(c, "无效的菜单ID")
+		return
+	}
+	var body map[string]interface{}
+	if err := c.ShouldBindJSON(&body); err != nil {
 		response.BadRequest(c, "参数错误："+err.Error())
 		return
 	}
-	m.ID = uint(id)
-	if err := h.menu.Update(&m); err != nil {
-		response.Internal(c, "更新菜单失败")
+	// 兼容 sort / sort_order
+	if v, ok := body["sort_order"]; ok {
+		body["sort"] = v
+		delete(body, "sort_order")
+	}
+	delete(body, "id")
+	delete(body, "children") // 过滤可能携带的子项数组，避免 GORM 尝试保存未知列
+	delete(body, "created_at")
+	delete(body, "updated_at")
+
+	if err := h.menu.UpdateFields(uint(id), body); err != nil {
+		response.Internal(c, "更新菜单失败: "+err.Error())
 		return
 	}
-	response.OK(c, m)
+	response.OK(c, gin.H{"message": "更新成功"})
 }
 
 // Delete DELETE /api/admin/menus/:id 删除菜单
 func (h *MenuHandler) Delete(c *gin.Context) {
 	id, _ := strconv.Atoi(c.Param("id"))
+	if id == 0 {
+		response.BadRequest(c, "无效的菜单ID")
+		return
+	}
 	if err := h.menu.Delete(uint(id)); err != nil {
-		response.Internal(c, "删除菜单失败")
+		response.Internal(c, "删除菜单失败: "+err.Error())
 		return
 	}
 	response.OK(c, gin.H{"message": "删除成功"})