From accd7a6aceb76d8cb75f46f00bb6a77fa591fb0a Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 13 Jul 2021 16:45:12 +0800
Subject: [PATCH] aa

---
 controllers/user_controller.go | 32 +++++++++++++++++++++++++++++---
 routers/router.go              |  3 ++-
 services/user.go               |  6 +++++-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/controllers/user_controller.go b/controllers/user_controller.go
index 473c858..8ef541c 100644
--- a/controllers/user_controller.go
+++ b/controllers/user_controller.go
@@ -28,7 +28,7 @@ func RegisterUser(c *gin.Context) {
 		user = &UserParam{}
 	)
 	globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP())
-	if err = c.Bind(&user); err != nil {
+	if err = c.ShouldBind(&user); err != nil {
 		c.JSON(http.StatusOK, &CallBack{
 			Code: model.ErrCodeNormal,
 			Desc: err.Error(),
@@ -150,10 +150,36 @@ func UpdateUser(c *gin.Context) {
 }
 
 //获取菜单，文档 GET
-func GetMenu(c *gin.Context) {
+func GetMenus(c *gin.Context) {
 	globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP())
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetMenu(c)
+		retVal, err = services.GetMenus(c)
+		return retVal, "", err
+	}) {
+		return
+	}
+	return
+}
+
+//获取菜单，文档 GET
+func GetMenuDetail(c *gin.Context) {
+	var (
+		err  error
+		user = &struct {
+			ID int `json:"id" form:"id" binding:"required"` //菜单的ID
+		}{}
+	)
+	globals.SugarLogger.Debugf("Begin API :%s params: %v ip: %s", c.Request.URL, c.Params, c.ClientIP())
+	if err = c.Bind(&user); err != nil {
+		c.JSON(http.StatusOK, &CallBack{
+			Code: model.ErrCodeNormal,
+			Desc: err.Error(),
+		})
+		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
+		return
+	}
+	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
+		retVal, err = services.GetMenuDetail(c, user.ID)
 		return retVal, "", err
 	}) {
 		return
diff --git a/routers/router.go b/routers/router.go
index 1673b28..31b3b7c 100644
--- a/routers/router.go
+++ b/routers/router.go
@@ -32,5 +32,6 @@ func Init(r *gin.Engine) {
 	userw.POST("/login", controllers.Login)
 	userw.GET("/refreshCode", controllers.RefreshCode)
 	userw.POST("/register", controllers.RegisterUser)
-	userw.GET("/getMenu", controllers.GetMenu)
+	userw.GET("/getMenus", controllers.GetMenus)
+	userw.GET("/getMenuDetail", controllers.GetMenuDetail)
 }
diff --git a/services/user.go b/services/user.go
index 0e4bf33..aed3953 100644
--- a/services/user.go
+++ b/services/user.go
@@ -117,6 +117,10 @@ func UpdateUser(c *gin.Context, payload string) (err error) {
 	return err
 }
 
-func GetMenu(c *gin.Context) (menus []*model.Menu, err error) {
+func GetMenus(c *gin.Context) (menus []*model.Menu, err error) {
 	return dao.GetMenus(globals.GetDB())
 }
+
+func GetMenuDetail(c *gin.Context, id int) (menus []*model.Menu, err error) {
+	return
+}