添加角色、菜单增删接口

controllers/SystemController.go

@@ -2,11 +2,12 @@ package controllers
 
 import (
 	"fmt"
-	"light-apiengine/models"
 	"strconv"
 	"strings"
 	"time"
 
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
+
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
@@ -90,6 +91,28 @@ func System_Logout(c *SystemController) {
 	}
 }
 
+// _GetNavTree
+// @Title _GetNavTree
+// @Description 获取导航菜单
+// @Param	user    string  false  "用户id"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_GetNavTree(c *SystemController) {
+	user := c.Ctx.Param(":user")
+	ret := __none_func_system__(user)
+	var menus []sysmodel.SysMenuTree
+	c.Db.SQL(sysmodel.Selectall_sys_menu).Find(&menus)
+
+	var menutree []sysmodel.SysMenuTree
+	finChildrenMenu(&menus, "", nil, &menutree)
+	for i := 0; i < len(menutree); i++ {
+		finChildrenMenu(&menus, menutree[i].Id, &menutree[i], &menutree)
+	}
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", menutree})
+	}
+}
+
 // _GetMenuTree
 // @Title _GetMenuTree
 // @Description 获取系统菜单
@@ -97,11 +120,11 @@ func System_Logout(c *SystemController) {
 // @Success 200 {object} sysmodel.Account
 // @Failure 403 :id is empty
 func System_GetMenuTree(c *SystemController) {
+
 	user := c.Ctx.Param(":user")
 	ret := __none_func_system__(user)
 	var menus []sysmodel.SysMenuTree
 	c.Db.SQL(sysmodel.Selectall_sys_menu).Find(&menus)
-
 	var menutree []sysmodel.SysMenuTree
 	finChildrenMenu(&menus, "", nil, &menutree)
 	for i := 0; i < len(menutree); i++ {
@@ -110,6 +133,7 @@ func System_GetMenuTree(c *SystemController) {
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", menutree})
 	}
+
 }
 
 // _GetOrgTree
@@ -155,9 +179,11 @@ func finChildrenMenu(menus *[]sysmodel.SysMenuTree, parent string, parent_menu *
 	for _, m := range *menus {
 		if m.Parent == parent {
 			if parent_menu == nil {
+				m.Level = 0
 				*menutree = append(*menutree, m)
 				//finChildrenMenu(menus, m.Id, menutree[len(*menutree)-1], menutree)
 			} else {
+				m.Level = parent_menu.Level + 1
 				parent_menu.Children = append(parent_menu.Children, m)
 				finChildrenMenu(menus, m.Id, &parent_menu.Children[len(parent_menu.Children)-1], menutree)
 			}
@@ -363,6 +389,130 @@ func System_UpdateUser(c *SystemController) {
 	}
 }
 
+// _AddRole
+// @Title _AddRole
+// @Description 添加角色
+// @Param	name    string  false  "角色名称"
+// @Param	remark    string  false  "备注"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_AddRole(c *SystemController) {
+	var role models.SysRole
+	c.Ctx.BindJSON(&role)
+
+	tk, _ := c.Ctx.Get("token")
+	op := tk.(*entitys.Token)
+
+	role.Id = utils.NewUUID()
+	role.DelFlag = 1
+	role.CreateBy = op.UserId
+	role.LastUpdateBy = op.UserId
+	role.CreateTime = time.Now()
+	role.LastUpdateDate = time.Now()
+
+	_, err := c.Db.Insert(&role)
+
+	ret := __none_func_system__()
+	if ret && err == nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+	}
+}
+
+// _DelRole
+// @Title _DelRole
+// @Description 添加角色
+// @Param	id    string  false  "角色ID"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_DelRole(c *SystemController) {
+	type Param struct {
+		Id string `json:"id"`
+	}
+
+	var params []Param
+	c.Ctx.BindJSON(&params)
+	fmt.Println(params, "-----------")
+	ids := []string{}
+	for _, param := range params {
+		ids = append(ids, param.Id)
+	}
+
+	_, err := c.Db.Table(new(models.SysRole)).In("id", ids).Update(map[string]interface{}{"del_flag": 0})
+	if err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	ret := __none_func_system__()
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
+// _UpdateRole
+// @Title _UpdateRole
+// @Description 修改角色
+// @Param	id    string  false  "角色ID"
+// @Param	name    string  false  "角色名称"
+// @Param	remark    string  false  "备注"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_UpdateRole(c *SystemController) {
+
+	var role models.SysRole
+	c.Ctx.BindJSON(&role)
+
+	tk, _ := c.Ctx.Get("token")
+	op := tk.(*entitys.Token)
+
+	role.LastUpdateBy = op.UserId
+	role.LastUpdateDate = time.Now()
+
+	c.Db.ID(role.Id).Update(&role)
+
+	ret := __none_func_system__()
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
+// _FindRolePage
+// @Title _FindRolePage
+// @Description 角色分页
+// @Param	page      false  "分页参数"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_FindRolePage(c *SystemController) {
+	var getpageinfo models.GetPageInfo
+	c.Ctx.BindJSON(&getpageinfo)
+
+	page := sysmodel.SysRolePageInfo{}
+	var roles []sysmodel.SysRole
+	err := c.Db.SQL(sysmodel.Selectall_sys_role).Limit(getpageinfo.PageSize, (getpageinfo.PageNum-1)*getpageinfo.PageSize).Find(&roles)
+	if err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+	fmt.Println("-----------", len(roles))
+	page.Content = roles
+	page.PageSize = getpageinfo.PageSize
+	page.PageNum = getpageinfo.PageNum
+	page.TotalSize = 1
+
+	ret := __none_func_system__(getpageinfo)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", page})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
 // _FindRoleMenu
 // @Title _FindRoleMenu
 // @Description 查找角色权限
@@ -370,8 +520,33 @@ func System_UpdateUser(c *SystemController) {
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 func System_FindRoleMenu(c *SystemController) {
-	user := c.Ctx.Param(":user")
-	ret := __none_func_system__(user)
+
+	tk, _ := c.Ctx.Get("token")
+	op := tk.(*entitys.Token)
+
+	menus := []models.SysMenu{}
+	c.Db.SQL(models.SqlSelectRoleMenuByUserId, op.UserId).Find(&menus)
+
+	ret := __none_func_system__()
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", menus})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
+// _SaveRoleMenu
+// @Title _SaveRoleMenu
+// @Description 保存角色权限
+// @Param	role_menu    string  false  "角色权限"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_SaveRoleMenu(c *SystemController) {
+	var saverolemenu []models.SaveRoleMenu
+
+	c.Ctx.BindJSON(&saverolemenu)
+
+	ret := __none_func_system__(&saverolemenu)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
@@ -397,17 +572,51 @@ func System_RoleAll(c *SystemController) {
 	}
 }
 
+// _FindPermissions
+// @Title _FindPermissions
+// @Description 查找用户权限
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_FindPermissions(c *SystemController) {
+
+	ret := __none_func_system__()
+
+	strs := []string{"sys:menu:add", "sys:menu:view", "sys:menu:edit", "sys:menu:delete", "sys:user:edit", "sys:user:delete", "sys:user:add", "sys:role:view", "sys:role:edit", "sys:role:delete", "sys:role:add"}
+
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", strs})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
 // _AddMenu
 // @Title _AddMenu
-// @Description 增加菜单
-// @Param	perms    string  false  "权限标识"
-// @Param	domain    string  false  "域"
+// @Description 添加菜单
+// @Param	    string  false  "菜单"
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 func System_AddMenu(c *SystemController) {
-	perms := c.Ctx.Param(":perms")
-	domain := c.Ctx.Param(":domain")
-	ret := __none_func_system__(perms, domain)
+	var sysmenu models.SysMenu
+	c.Ctx.BindJSON(&sysmenu)
+
+	tk, _ := c.Ctx.Get("token")
+	op := tk.(*entitys.Token)
+
+	sysmenu.Id = utils.NewUUID()
+	sysmenu.CreateBy = op.UserId
+	sysmenu.LastUpdateBy = op.UserId
+	sysmenu.LastUpdateDate = time.Now()
+	sysmenu.CreateTime = time.Now()
+	sysmenu.DelFlag = 1
+
+	_, err := c.Db.Insert(&sysmenu)
+	if err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	ret := __none_func_system__(sysmenu)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
@@ -418,12 +627,29 @@ func System_AddMenu(c *SystemController) {
 // _DelMenu
 // @Title _DelMenu
 // @Description 删除菜单
-// @Param	id    string  false  "ID"
+// @Param	id    string  false  "菜单ID"
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 func System_DelMenu(c *SystemController) {
-	id := c.Ctx.Param(":id")
-	ret := __none_func_system__(id)
+	type Param struct {
+		Id string `json:"id"`
+	}
+
+	var params []Param
+	c.Ctx.BindJSON(&params)
+	fmt.Println(params, "-----------")
+	ids := []string{}
+	for _, param := range params {
+		ids = append(ids, param.Id)
+	}
+
+	_, err := c.Db.Table(new(models.SysMenu)).In("id", ids).Update(map[string]interface{}{"del_flag": 0})
+	if err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	ret := __none_func_system__()
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
@@ -431,19 +657,32 @@ func System_DelMenu(c *SystemController) {
 	}
 }
 
-// _FindPermissions
-// @Title _FindPermissions
-// @Description 查找用户权限
+// _UpdateMenu
+// @Title _UpdateMenu
+// @Description 更新菜单
+// @Param	    string  false  "菜单"
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
-func System_FindPermissions(c *SystemController) {
+func System_UpdateMenu(c *SystemController) {
+	var sysmenu models.SysMenu
+	c.Ctx.BindJSON(&sysmenu)
 
-	ret := __none_func_system__()
+	tk, _ := c.Ctx.Get("token")
+	op := tk.(*entitys.Token)
 
-	strs := []string{"sys:user:edit", "sys:user:delete", "sys:user:add"}
+	sysmenu.LastUpdateBy = op.UserId
+	sysmenu.LastUpdateDate = time.Now()
 
+	_, err := c.Db.ID(sysmenu.Id).Update(&sysmenu)
+
+	if err != nil {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	ret := __none_func_system__(sysmenu)
 	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", strs})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
 		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
 	}

controllers/SystemController_gen.go

@@ -44,6 +44,18 @@ func (c *SystemController) Logout() {
 	System_Logout(c)
 }
 
+// GetNavTree
+// @Title GetNavTree
+// @Description 获取导航菜单         
+// @Param	user    string  false  "用户id"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /get_nav_tree  [post,get]
+func (c *SystemController) GetNavTree() {
+	//
+	System_GetNavTree(c)
+}
+
 // GetMenuTree
 // @Title GetMenuTree
 // @Description 获取系统菜单         
@@ -121,10 +133,61 @@ func (c *SystemController) UpdateUser() {
 	System_UpdateUser(c)
 }
 
+// AddRole
+// @Title AddRole
+// @Description 添加角色         
+// @Param	name    string  false  "角色名称"  
+// @Param	remark    string  false  "备注"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /add_role  [post,get,put]
+func (c *SystemController) AddRole() {
+	//
+	System_AddRole(c)
+}
+
+// DelRole
+// @Title DelRole
+// @Description 添加角色         
+// @Param	id    string  false  "角色ID"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /del_role  [post,get,put]
+func (c *SystemController) DelRole() {
+	//
+	System_DelRole(c)
+}
+
+// UpdateRole
+// @Title UpdateRole
+// @Description 修改角色         
+// @Param	id    string  false  "角色ID"  
+// @Param	name    string  false  "角色名称"  
+// @Param	remark    string  false  "备注"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /update_role  [post,get,put]
+func (c *SystemController) UpdateRole() {
+	//
+	System_UpdateRole(c)
+}
+
+// FindRolePage
+// @Title FindRolePage
+// @Description 角色分页         
+// @Param	page      false  "分页参数"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /find_role_page  [post,get,put]
+func (c *SystemController) FindRolePage() {
+	//
+	System_FindRolePage(c)
+}
+
 // FindRoleMenu
 // @Title FindRoleMenu
 // @Description 查找角色权限         
-// @Param	user    string  false  "用户id"  
+// @Param	role_id    string  false  "角色id"  
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 // @router /find_role_menu  [post,get,put]
@@ -133,6 +196,18 @@ func (c *SystemController) FindRoleMenu() {
 	System_FindRoleMenu(c)
 }
 
+// SaveRoleMenu
+// @Title SaveRoleMenu
+// @Description 保存角色权限         
+// @Param	role_menu    string  false  "角色权限"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /save_role_menu  [post,get,put]
+func (c *SystemController) SaveRoleMenu() {
+	//
+	System_SaveRoleMenu(c)
+}
+
 // RoleAll
 // @Title RoleAll
 // @Description 查找所有角色         
@@ -144,11 +219,21 @@ func (c *SystemController) RoleAll() {
 	System_RoleAll(c)
 }
 
+// FindPermissions
+// @Title FindPermissions
+// @Description 查找用户权限         
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /find_permissions  [post,get,put]
+func (c *SystemController) FindPermissions() {
+	//
+	System_FindPermissions(c)
+}
+
 // AddMenu
 // @Title AddMenu
-// @Description 增加菜单         
-// @Param	perms    string  false  "权限标识"  
-// @Param	domain    string  false  "域"  
+// @Description 添加菜单         
+// @Param	    string  false  "菜单"  
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 // @router /add_menu  [post,get,put]
@@ -160,7 +245,7 @@ func (c *SystemController) AddMenu() {
 // DelMenu
 // @Title DelMenu
 // @Description 删除菜单         
-// @Param	id    string  false  "ID"  
+// @Param	id    string  false  "菜单ID"  
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 // @router /del_menu  [post,get,put]
@@ -169,14 +254,15 @@ func (c *SystemController) DelMenu() {
 	System_DelMenu(c)
 }
 
-// FindPermissions
-// @Title FindPermissions
-// @Description 查找用户权限         
+// UpdateMenu
+// @Title UpdateMenu
+// @Description 更新菜单         
+// @Param	    string  false  "菜单"  
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
-// @router /find_permissions  [post,get,put]
-func (c *SystemController) FindPermissions() {
+// @router /update_menu  [post,get,put]
+func (c *SystemController) UpdateMenu() {
 	//
-	System_FindPermissions(c)
+	System_UpdateMenu(c)
 }
 

middleware/login_ware.go

@@ -14,12 +14,12 @@ func LoginWare() gin.HandlerFunc {
 		//fmt.Println("--LoginWare----token: ", token)
 
 		if token == "" {
-			c.AbortWithStatusJSON(200, sysmodel.SysReturn{401, "token is empty", ""})
+			c.AbortWithStatusJSON(401, sysmodel.SysReturn{401, "token is empty", ""})
 		}
 
 		tk := utils.GlobalTokenStore.Get(token)
 		if tk == nil {
-			c.AbortWithStatusJSON(200, sysmodel.SysReturn{401, "token Invalid", ""})
+			c.AbortWithStatusJSON(401, sysmodel.SysReturn{401, "token Invalid", ""})
 		}
 
 		c.Set("token", tk)

models/SaveRoleMenu_gen.go

@@ -0,0 +1,14 @@
+
+package models
+import (
+
+)
+
+type SaveRoleMenu struct {
+	
+	//角色ID
+	RoleId   string `json:"role_id"`
+	//菜单ID
+	MenuId   string `json:"menu_id"`
+
+}

models/Sql_SysMenu.go

@@ -0,0 +1,21 @@
+package models
+
+var SqlSelectRoleMenuByUserId = `
+SELECT sys_menu.*
+FROM
+	sys_user
+LEFT JOIN
+	sys_user_role
+ON
+	sys_user.id = sys_user_role.user_id
+LEFT JOIN
+	sys_role_menu
+ON
+	sys_user_role.role_id = sys_role_menu.role_id
+LEFT JOIN
+	sys_menu
+ON
+	sys_menu.id = sys_role_menu.menu_id
+WHERE
+	sys_user.id = ?
+`

models/Sql_SysMenu_gen.go

@@ -1,11 +1,11 @@
-
 package models
-    var Insert_sys_menu = "insert into sys_menu(`id`,`name`,`code`,`parent`,`url`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?name,?code,?parent,?url,?perms,?type,?icon,?order_num,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
 
-    var Update_sys_menu = "update sys_menu set `name` = ?name,`code` = ?code,`parent` = ?parent,`url` = ?url,`perms` = ?perms,`type` = ?type,`icon` = ?icon,`order_num` = ?order_num,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
+var Insert_sys_menu = "insert into sys_menu(`id`,`name`,`code`,`parent`,`url`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?name,?code,?parent,?url,?perms,?type,?icon,?order_num,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
+
+var Update_sys_menu = "update sys_menu set `name` = ?name,`code` = ?code,`parent` = ?parent,`url` = ?url,`perms` = ?perms,`type` = ?type,`icon` = ?icon,`order_num` = ?order_num,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
 
-    var Deleteone_sys_menu = "delete from sys_menuwhere id =?id"
+var Deleteone_sys_menu = "delete from sys_menuwhere id =?id"
 
-    var Selectone_sys_menu = "select `id`,`name`,`code`,`parent`,`url`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_menu where id = ?id"
+var Selectone_sys_menu = "select `id`,`name`,`code`,`parent`,`url`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_menu where id = ?id"
 
-    var Selectall_sys_menu = "select `id`,`name`,`code`,`parent`,`url`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_menu"
+var Selectall_sys_menu = "select `id`,`name`,`code`,`parent`,`url`,`perms`,`type`,`icon`,`order_num`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_menu where del_flag = 1"

models/SysMenuTree_gen.go

@@ -38,5 +38,7 @@ type SysMenuTree struct {
 
 	//子列表
 	Children   []SysMenuTree `json:"children"`
+	//目录层级
+	Level   int32 `json:"level"`
 
 }

routers/router_gen.go

@@ -23,6 +23,10 @@ func systemController_logout(c *gin.Context) {
 	controllers.NewSystemController(c, g_engine).Logout()
 }
 
+func systemController_get_nav_tree(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).GetNavTree()
+}
+
 func systemController_get_menu_tree(c *gin.Context) {
 	controllers.NewSystemController(c, g_engine).GetMenuTree()
 }
@@ -47,14 +51,38 @@ func systemController_update_user(c *gin.Context) {
 	controllers.NewSystemController(c, g_engine).UpdateUser()
 }
 
+func systemController_add_role(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).AddRole()
+}
+
+func systemController_del_role(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).DelRole()
+}
+
+func systemController_update_role(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).UpdateRole()
+}
+
+func systemController_find_role_page(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).FindRolePage()
+}
+
 func systemController_find_role_menu(c *gin.Context) {
 	controllers.NewSystemController(c, g_engine).FindRoleMenu()
 }
 
+func systemController_save_role_menu(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).SaveRoleMenu()
+}
+
 func systemController_role_all(c *gin.Context) {
 	controllers.NewSystemController(c, g_engine).RoleAll()
 }
 
+func systemController_find_permissions(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).FindPermissions()
+}
+
 func systemController_add_menu(c *gin.Context) {
 	controllers.NewSystemController(c, g_engine).AddMenu()
 }
@@ -63,8 +91,8 @@ func systemController_del_menu(c *gin.Context) {
 	controllers.NewSystemController(c, g_engine).DelMenu()
 }
 
-func systemController_find_permissions(c *gin.Context) {
-	controllers.NewSystemController(c, g_engine).FindPermissions()
+func systemController_update_menu(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).UpdateMenu()
 }
 
 func apiController_api_doc(c *gin.Context) {
@@ -110,6 +138,10 @@ func InitRouter(e *engine.ApiEngine) {
 	//v1.POST("/system/login", systemController_login)
 	//v1.PUT("/system/login", systemController_login)
 
+	v1.GET("/system/get_nav_tree", systemController_get_nav_tree)
+	v1.POST("/system/get_nav_tree", systemController_get_nav_tree)
+	//v1.PUT("/system/get_nav_tree",systemController_get_nav_tree)
+
 	v1.GET("/system/get_menu_tree", systemController_get_menu_tree)
 	v1.POST("/system/get_menu_tree", systemController_get_menu_tree)
 	//v1.PUT("/system/get_menu_tree",systemController_get_menu_tree)
@@ -134,14 +166,38 @@ func InitRouter(e *engine.ApiEngine) {
 	v1.POST("/system/update_user", systemController_update_user)
 	v1.PUT("/system/update_user", systemController_update_user)
 
+	v1.GET("/system/add_role", systemController_add_role)
+	v1.POST("/system/add_role", systemController_add_role)
+	v1.PUT("/system/add_role", systemController_add_role)
+
+	v1.GET("/system/del_role", systemController_del_role)
+	v1.POST("/system/del_role", systemController_del_role)
+	v1.PUT("/system/del_role", systemController_del_role)
+
+	v1.GET("/system/update_role", systemController_update_role)
+	v1.POST("/system/update_role", systemController_update_role)
+	v1.PUT("/system/update_role", systemController_update_role)
+
+	v1.GET("/system/find_role_page", systemController_find_role_page)
+	v1.POST("/system/find_role_page", systemController_find_role_page)
+	v1.PUT("/system/find_role_page", systemController_find_role_page)
+
 	v1.GET("/system/find_role_menu", systemController_find_role_menu)
 	v1.POST("/system/find_role_menu", systemController_find_role_menu)
 	v1.PUT("/system/find_role_menu", systemController_find_role_menu)
 
+	v1.GET("/system/save_role_menu", systemController_save_role_menu)
+	v1.POST("/system/save_role_menu", systemController_save_role_menu)
+	v1.PUT("/system/save_role_menu", systemController_save_role_menu)
+
 	v1.GET("/system/role_all", systemController_role_all)
 	v1.POST("/system/role_all", systemController_role_all)
 	v1.PUT("/system/role_all", systemController_role_all)
 
+	v1.GET("/system/find_permissions", systemController_find_permissions)
+	v1.POST("/system/find_permissions", systemController_find_permissions)
+	v1.PUT("/system/find_permissions", systemController_find_permissions)
+
 	v1.GET("/system/add_menu", systemController_add_menu)
 	v1.POST("/system/add_menu", systemController_add_menu)
 	v1.PUT("/system/add_menu", systemController_add_menu)
@@ -150,9 +206,9 @@ func InitRouter(e *engine.ApiEngine) {
 	v1.POST("/system/del_menu", systemController_del_menu)
 	v1.PUT("/system/del_menu", systemController_del_menu)
 
-	v1.GET("/system/find_permissions", systemController_find_permissions)
-	v1.POST("/system/find_permissions", systemController_find_permissions)
-	v1.PUT("/system/find_permissions", systemController_find_permissions)
+	v1.GET("/system/update_menu", systemController_update_menu)
+	v1.POST("/system/update_menu", systemController_update_menu)
+	v1.PUT("/system/update_menu", systemController_update_menu)
 
 	v1.GET("/api/api_doc", apiController_api_doc)
 	//v1.POST("/api/api_doc",apiController_api_doc)

utils/store.go

@@ -28,7 +28,7 @@ func (t *TokenStore) Get(key string) *entitys.Token {
 	t.lock.RLock()
 	defer t.lock.RUnlock()
 	if val, ok := t.tokens[key]; ok {
-		log.Println(key, "获取Token:", val.AccessToken, val.RefreshToken, val.LoginID)
+		//log.Println(key, "获取Token:", val.AccessToken, val.RefreshToken, val.LoginID)
 		return val
 	}
 	return nil