From f26a0cab5bca17b7eab57f6330e576271e17a17f Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期三, 13 十一月 2019 19:12:08 +0800 Subject: [PATCH] update ynSwagger,sync to master --- controllers/sysMenu.go | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/controllers/sysMenu.go b/controllers/sysMenu.go index 1010498..d0fc177 100644 --- a/controllers/sysMenu.go +++ b/controllers/sysMenu.go @@ -1,9 +1,10 @@ package controllers import ( + "basic.com/dbapi.git" "github.com/gin-gonic/gin" "webserver/extend/code" - "webserver/extend/logger" + "basic.com/valib/logger.git" "webserver/extend/util" "webserver/middlewares/auth" ) @@ -12,26 +13,49 @@ } -/* +// @Security ApiKeyAuth // @Summary 褰撳墠鐢ㄦ埛鐨勭郴缁熻彍鍗� // @Description 褰撳墠鐢ㄦ埛鐨勭郴缁熻彍鍗� -// @Accept json // @Produce json // @Tags 绯荤粺鑿滃崟 // @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}" // @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}" // @Router /data/api-v/sysmenus/me [get] -*/ func (controller SysMenuController) Me(c *gin.Context) { module := c.Param("module") logger.Debug("me.module:",module) authDriver := auth.GenerateAuthDriver() - user := (*authDriver).User(c) - logger.Debug("current:",user) - if user !=nil { - menus := user.(map[string]interface{})["permissions"] + userM := (*authDriver).User(c) + if userM !=nil { + menus := userM["permissions"] util.ResponseFormat(c,code.Success,menus) } else { util.ResponseFormat(c,code.NotLogin,"") } +} + +// @Security ApiKeyAuth +// @Summary 鏌ユ壘褰撳墠鐢ㄦ埛鍙鐨勭郴缁熻彍鍗� +// @Description 鏌ユ壘褰撳墠鐢ㄦ埛鍙鐨勭郴缁熻彍鍗� +// @Produce json +// @Tags 绯荤粺鑿滃崟 +// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}" +// @Failure 500 {string} json "{"code":500, success:false, msg:"", data:""}" +// @Router /data/api-v/sysmenus/tree [get] +func (smc SysMenuController) MenuTree(c *gin.Context) { + authDriver := auth.GenerateAuthDriver() + userM := (*authDriver).User(c) + logger.Debug("current:",userM) + if userM != nil { + userId := userM["id"].(string) + var api dbapi.SysMenuApi + b,d := api.MenuTree(userId) + if b { + util.ResponseFormat(c,code.Success,d) + } else { + util.ResponseFormat(c,code.ComError,"") + } + } else { + util.ResponseFormat(c,code.NotLogin,"璇风櫥褰�") + } } \ No newline at end of file -- Gitblit v1.8.0