From 1f5c67832b86e36856924fce731a7aa6ef633e1d Mon Sep 17 00:00:00 2001 From: YuleiLan Date: Tue, 14 Jul 2020 14:47:17 +0800 Subject: [PATCH] fix bug. --- apis/system/dept.go | 6 +- apis/system/menu.go | 8 +- apis/system/role.go | 11 +- apis/system/rolemenu.go | 5 +- apis/system/sysuser.go | 15 +- config/db.sql | 270 ++++++++++++++++++------------------ models/gorm/gorm.go | 20 +-- models/system/casbinrule.go | 5 +- models/system/dept.go | 3 +- models/system/loginlog.go | 3 +- models/system/menu.go | 5 +- models/system/model.go | 14 ++ models/system/post.go | 3 +- models/system/role.go | 3 +- models/system/roledept.go | 1 + models/system/rolemenu.go | 3 +- models/system/sysuser.go | 3 +- 17 files changed, 193 insertions(+), 185 deletions(-) create mode 100644 models/system/model.go diff --git a/apis/system/dept.go b/apis/system/dept.go index d0fd098..00e6e25 100644 --- a/apis/system/dept.go +++ b/apis/system/dept.go @@ -107,8 +107,8 @@ func UpdateDept(c *gin.Context) { // @Router /api/v1/dept/{id} [delete] func DeleteDept(c *gin.Context) { var data system.Dept - id, err := tools.StringToInt(c.Param("id")) - _, err = data.Delete(id) + id, _ := tools.StringToInt(c.Param("id")) + _, err := data.Delete(id) tools.HasError(err, "删除失败", 500) app.OK(c, "", msg.DeletedSuccess) } @@ -116,7 +116,7 @@ func DeleteDept(c *gin.Context) { func GetDeptTreeRoleselect(c *gin.Context) { var Dept system.Dept var SysRole system.SysRole - id, err := tools.StringToInt(c.Param("roleId")) + id, _ := tools.StringToInt(c.Param("roleId")) SysRole.RoleId = id result, err := Dept.SetDeptLable() tools.HasError(err, msg.NotFound, -1) diff --git a/apis/system/menu.go b/apis/system/menu.go index 1817e4c..f76e567 100644 --- a/apis/system/menu.go +++ b/apis/system/menu.go @@ -39,7 +39,7 @@ func GetMenuList(c *gin.Context) { // @Security Bearer func GetMenu(c *gin.Context) { var data system.Menu - id, err := tools.StringToInt(c.Param("id")) + id, _ := tools.StringToInt(c.Param("id")) data.MenuId = id result, err := data.GetByMenuId() tools.HasError(err, "抱歉未找到相关信息", -1) @@ -49,7 +49,7 @@ func GetMenu(c *gin.Context) { func GetMenuTreeRoleselect(c *gin.Context) { var Menu system.Menu var SysRole system.SysRole - id, err := tools.StringToInt(c.Param("roleId")) + id, _ := tools.StringToInt(c.Param("roleId")) SysRole.RoleId = id result, err := Menu.SetMenuLable() tools.HasError(err, "抱歉未找到相关信息", -1) @@ -137,9 +137,9 @@ func UpdateMenu(c *gin.Context) { // @Router /api/v1/menu/{id} [delete] func DeleteMenu(c *gin.Context) { var data system.Menu - id, err := tools.StringToInt(c.Param("id")) + id, _ := tools.StringToInt(c.Param("id")) data.UpdateBy = tools.GetUserIdStr(c) - _, err = data.Delete(id) + _, err := data.Delete(id) tools.HasError(err, "删除失败", 500) app.OK(c, "", "删除成功") } diff --git a/apis/system/role.go b/apis/system/role.go index 9ea3104..ae0131c 100644 --- a/apis/system/role.go +++ b/apis/system/role.go @@ -4,6 +4,7 @@ import ( "ferry/models/system" "ferry/tools" "ferry/tools/app" + "fmt" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" @@ -55,9 +56,8 @@ func GetRoleList(c *gin.Context) { func GetRole(c *gin.Context) { var Role system.SysRole Role.RoleId, _ = tools.StringToInt(c.Param("roleId")) - result, err := Role.Get() - menuIds := make([]int, 0) - menuIds, err = Role.GetRoleMeunId() + result, _ := Role.Get() + menuIds, err := Role.GetRoleMeunId() tools.HasError(err, "抱歉未找到相关信息", -1) result.MenuIds = menuIds app.OK(c, result, "") @@ -100,6 +100,9 @@ func UpdateRole(c *gin.Context) { var data system.SysRole data.UpdateBy = tools.GetUserIdStr(c) err := c.Bind(&data) + fmt.Println("--------------------------") + fmt.Println(err) + fmt.Println("--------------------------") tools.HasError(err, "数据解析失败", -1) result, err := data.Update(data.RoleId) tools.HasError(err, "", -1) @@ -117,7 +120,7 @@ func UpdateRoleDataScope(c *gin.Context) { data.UpdateBy = tools.GetUserIdStr(c) err := c.Bind(&data) tools.HasError(err, "数据解析失败", -1) - result, err := data.Update(data.RoleId) + result, _ := data.Update(data.RoleId) var t system.SysRoleDept _, err = t.DeleteRoleDept(data.RoleId) diff --git a/apis/system/rolemenu.go b/apis/system/rolemenu.go index 4491b5b..fb87a2e 100644 --- a/apis/system/rolemenu.go +++ b/apis/system/rolemenu.go @@ -19,7 +19,7 @@ import ( // @Security Bearer func GetRoleMenu(c *gin.Context) { var Rm system.RoleMenu - err := c.ShouldBind(&Rm) + _ = c.ShouldBind(&Rm) result, err := Rm.Get() var res app.Response if err != nil { @@ -41,8 +41,6 @@ func InsertRoleMenu(c *gin.Context) { var res app.Response res.Msg = "添加成功" c.JSON(http.StatusOK, res.ReturnOK()) - return - } // @Summary 删除用户菜单数据 @@ -68,5 +66,4 @@ func DeleteRoleMenu(c *gin.Context) { var res app.Response res.Msg = "删除成功" c.JSON(http.StatusOK, res.ReturnOK()) - return } diff --git a/apis/system/sysuser.go b/apis/system/sysuser.go index bfe75de..1ee893a 100644 --- a/apis/system/sysuser.go +++ b/apis/system/sysuser.go @@ -66,8 +66,8 @@ func GetSysUser(c *gin.Context) { tools.HasError(err, "抱歉未找到相关信息", -1) var SysRole system.SysRole var Post system.Post - roles, err := SysRole.GetList() - posts, err := Post.GetList() + roles, _ := SysRole.GetList() + posts, _ := Post.GetList() postIds := make([]int, 0) postIds = append(postIds, result.PostId) @@ -100,12 +100,12 @@ func GetSysUserProfile(c *gin.Context) { var Post system.Post var Dept system.Dept //获取角色列表 - roles, err := SysRole.GetList() + roles, _ := SysRole.GetList() //获取职位列表 - posts, err := Post.GetList() + posts, _ := Post.GetList() //获取部门列表 Dept.DeptId = result.DeptId - dept, err := Dept.Get() + dept, _ := Dept.Get() postIds := make([]int, 0) postIds = append(postIds, result.PostId) @@ -134,6 +134,7 @@ func GetSysUserInit(c *gin.Context) { var SysRole system.SysRole var Post system.Post roles, err := SysRole.GetList() + tools.HasError(err, "抱歉未找到相关信息", -1) posts, err := Post.GetList() tools.HasError(err, "抱歉未找到相关信息", -1) mp := make(map[string]interface{}, 2) @@ -219,7 +220,7 @@ func InsetSysUserAvatar(c *gin.Context) { sysuser.UserId = tools.GetUserId(c) sysuser.Avatar = "/" + filPath sysuser.UpdateBy = tools.GetUserIdStr(c) - sysuser.Update(sysuser.UserId) + _, _ = sysuser.Update(sysuser.UserId) app.OK(c, filPath, "修改成功") } @@ -229,6 +230,6 @@ func SysUserUpdatePwd(c *gin.Context) { tools.HasError(err, "数据解析失败", 500) sysuser := system.SysUser{} sysuser.UserId = tools.GetUserId(c) - sysuser.SetPwd(pwd) + _, _ = sysuser.SetPwd(pwd) app.OK(c, "", "密码修改成功") } diff --git a/config/db.sql b/config/db.sql index 9f670df..6a2f8f4 100644 --- a/config/db.sql +++ b/config/db.sql @@ -226,141 +226,141 @@ INSERT INTO `sys_role` VALUES (3, '测试角色', 0, 'Tester', 3, '', '1', NULL, COMMIT; BEGIN; -INSERT INTO `sys_role_menu` VALUES (1, 2, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 3, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 43, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 44, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 45, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 46, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 51, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 52, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 56, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 57, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 58, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 59, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 60, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 61, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 62, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 63, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 64, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 66, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 67, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 68, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 69, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 70, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 71, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 72, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 73, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 74, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 75, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 76, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 77, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 78, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 79, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 80, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 81, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 82, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 83, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 84, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 85, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 86, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 87, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 88, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 89, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 90, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 91, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 92, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 93, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 94, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 95, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 96, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 97, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 103, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 104, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 105, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 106, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 107, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 108, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 109, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 110, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 111, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 112, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 113, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 114, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 115, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 116, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 117, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 118, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 119, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 120, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 121, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 122, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 123, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 137, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 138, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 139, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 140, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 141, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 142, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 201, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 202, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 203, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 204, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 205, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 206, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 211, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 212, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 213, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 214, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 215, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 216, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 217, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 220, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 221, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 222, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 223, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 224, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 225, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 226, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 227, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 228, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 229, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 230, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 231, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 232, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 233, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 234, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 235, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 236, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 237, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 238, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 239, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 240, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 241, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 242, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 243, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 244, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 245, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 246, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 247, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 248, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 249, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 250, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 251, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 252, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 253, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 254, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 255, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 256, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 257, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 258, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 259, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 260, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 261, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 262, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 263, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 264, 'admin', NULL, NULL); -INSERT INTO `sys_role_menu` VALUES (1, 267, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 2, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 3, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 43, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 44, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 45, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 46, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 51, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 52, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 56, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 57, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 58, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 59, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 60, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 61, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 62, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 63, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 64, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 66, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 67, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 68, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 69, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 70, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 71, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 72, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 73, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 74, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 75, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 76, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 77, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 78, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 79, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 80, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 81, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 82, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 83, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 84, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 85, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 86, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 87, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 88, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 89, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 90, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 91, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 92, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 93, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 94, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 95, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 96, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 97, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 103, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 104, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 105, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 106, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 107, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 108, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 109, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 110, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 111, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 112, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 113, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 114, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 115, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 116, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 117, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 118, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 119, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 120, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 121, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 122, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 123, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 137, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 138, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 139, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 140, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 141, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 142, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 201, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 202, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 203, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 204, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 205, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 206, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 211, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 212, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 213, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 214, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 215, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 216, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 217, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 220, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 221, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 222, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 223, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 224, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 225, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 226, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 227, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 228, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 229, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 230, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 231, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 232, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 233, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 234, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 235, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 236, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 237, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 238, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 239, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 240, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 241, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 242, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 243, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 244, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 245, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 246, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 247, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 248, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 249, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 250, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 251, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 252, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 253, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 254, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 255, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 256, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 257, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 258, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 259, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 260, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 261, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 262, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 263, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 264, 'admin', NULL, NULL); +INSERT INTO `sys_role_menu`(role_id, menu_id, role_name, create_by, update_by) VALUES (1, 267, 'admin', NULL, NULL); COMMIT; BEGIN; diff --git a/models/gorm/gorm.go b/models/gorm/gorm.go index 51496c9..fbd2c2e 100644 --- a/models/gorm/gorm.go +++ b/models/gorm/gorm.go @@ -10,16 +10,16 @@ func AutoMigrate(db *gorm.DB) error { db.SingularTable(true) return db.AutoMigrate( // 系统管理 - &system.CasbinRule{}, - &system.Dept{}, - &system.Menu{}, - &system.LoginLog{}, - &system.RoleMenu{}, - &system.SysRoleDept{}, - &system.SysUser{}, - &system.SysRole{}, - &system.Post{}, - // 流程中心 + new(system.CasbinRule), + new(system.Dept), + new(system.Menu), + new(system.LoginLog), + new(system.RoleMenu), + new(system.SysRoleDept), + new(system.SysUser), + new(system.SysRole), + new(system.Post), + // 流程中心 ).Error } diff --git a/models/system/casbinrule.go b/models/system/casbinrule.go index 2a69262..b7b755c 100644 --- a/models/system/casbinrule.go +++ b/models/system/casbinrule.go @@ -1,7 +1,5 @@ package system -import "ferry/models/base" - //casbin_rule type CasbinRule struct { PType string `json:"p_type" gorm:"type:varchar(100);"` @@ -11,7 +9,8 @@ type CasbinRule struct { V3 string `json:"v3" gorm:"type:varchar(100);"` V4 string `json:"v4" gorm:"type:varchar(100);"` V5 string `json:"v5" gorm:"type:varchar(100);"` - base.Model + Id int `gorm:"primary_key;AUTO_INCREMENT;column:id" json:"id" form:"id"` + BaseModel } func (CasbinRule) TableName() string { diff --git a/models/system/dept.go b/models/system/dept.go index 98b2701..955cbf0 100644 --- a/models/system/dept.go +++ b/models/system/dept.go @@ -3,7 +3,6 @@ package system import ( "errors" "ferry/global/orm" - "ferry/models/base" "ferry/tools" _ "time" ) @@ -23,7 +22,7 @@ type Dept struct { DataScope string `json:"dataScope" gorm:"-"` Params string `json:"params" gorm:"-"` Children []Dept `json:"children" gorm:"-"` - base.Model + BaseModel } func (Dept) TableName() string { diff --git a/models/system/loginlog.go b/models/system/loginlog.go index a1e4ad7..da3575a 100644 --- a/models/system/loginlog.go +++ b/models/system/loginlog.go @@ -2,7 +2,6 @@ package system import ( "ferry/global/orm" - "ferry/models/base" "time" ) @@ -22,7 +21,7 @@ type LoginLog struct { Params string `json:"params" gorm:"-"` // Remark string `json:"remark" gorm:"type:varchar(255);"` //备注 Msg string `json:"msg" gorm:"type:varchar(255);"` - base.Model + BaseModel } func (LoginLog) TableName() string { diff --git a/models/system/menu.go b/models/system/menu.go index 83327cb..97cf4dd 100644 --- a/models/system/menu.go +++ b/models/system/menu.go @@ -3,7 +3,6 @@ package system import ( "errors" "ferry/global/orm" - "ferry/models/base" "ferry/tools" ) @@ -31,7 +30,7 @@ type Menu struct { RoleId int `gorm:"-"` Children []Menu `json:"children" gorm:"-"` IsSelect bool `json:"is_select" gorm:"-"` - base.Model + BaseModel } func (Menu) TableName() string { @@ -66,7 +65,7 @@ type Menus struct { UpdateBy string `json:"updateBy" gorm:"column:update_by"` DataScope string `json:"dataScope" gorm:"-"` Params string `json:"params" gorm:"-"` - base.Model + BaseModel } func (Menus) TableName() string { diff --git a/models/system/model.go b/models/system/model.go new file mode 100644 index 0000000..2e953c8 --- /dev/null +++ b/models/system/model.go @@ -0,0 +1,14 @@ +package system + +/* + @Author : lanyulei +*/ +import ( + "time" +) + +type BaseModel struct { + CreatedAt time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"` + UpdatedAt time.Time `gorm:"column:update_time" json:"update_time" form:"update_time"` + DeletedAt *time.Time `gorm:"column:delete_time" sql:"index" json:"-"` +} diff --git a/models/system/post.go b/models/system/post.go index 0761a69..268d6d9 100644 --- a/models/system/post.go +++ b/models/system/post.go @@ -2,7 +2,6 @@ package system import ( "ferry/global/orm" - "ferry/models/base" "ferry/tools" ) @@ -17,7 +16,7 @@ type Post struct { UpdateBy string `gorm:"type:varchar(128);" json:"updateBy"` DataScope string `gorm:"-" json:"dataScope"` Params string `gorm:"-" json:"params"` - base.Model + BaseModel } func (Post) TableName() string { diff --git a/models/system/role.go b/models/system/role.go index bc12a07..90147b4 100644 --- a/models/system/role.go +++ b/models/system/role.go @@ -2,7 +2,6 @@ package system import ( "ferry/global/orm" - "ferry/models/base" "ferry/tools" "github.com/pkg/errors" @@ -23,7 +22,7 @@ type SysRole struct { Params string `json:"params" gorm:"-"` MenuIds []int `json:"menuIds" gorm:"-"` DeptIds []int `json:"deptIds" gorm:"-"` - base.Model + BaseModel } func (SysRole) TableName() string { diff --git a/models/system/roledept.go b/models/system/roledept.go index a3de1ae..46e0ba0 100644 --- a/models/system/roledept.go +++ b/models/system/roledept.go @@ -9,6 +9,7 @@ import ( type SysRoleDept struct { RoleId int `gorm:"type:int(11)"` DeptId int `gorm:"type:int(11)"` + Id int `gorm:"primary_key;AUTO_INCREMENT;column:id" json:"id" form:"id"` } func (SysRoleDept) TableName() string { diff --git a/models/system/rolemenu.go b/models/system/rolemenu.go index 03d2e32..81e83e9 100644 --- a/models/system/rolemenu.go +++ b/models/system/rolemenu.go @@ -2,7 +2,6 @@ package system import ( "ferry/global/orm" - "ferry/models/base" "ferry/tools" "fmt" ) @@ -13,7 +12,7 @@ type RoleMenu struct { RoleName string `gorm:"type:varchar(128)"` CreateBy string `gorm:"type:varchar(128)"` UpdateBy string `gorm:"type:varchar(128)"` - base.Model + Id int `gorm:"primary_key;AUTO_INCREMENT;column:id" json:"id" form:"id"` } func (RoleMenu) TableName() string { diff --git a/models/system/sysuser.go b/models/system/sysuser.go index d616e11..b15b95b 100644 --- a/models/system/sysuser.go +++ b/models/system/sysuser.go @@ -3,7 +3,6 @@ package system import ( "errors" "ferry/global/orm" - "ferry/models/base" "ferry/tools" "strings" @@ -57,7 +56,7 @@ type SysUserB struct { Status string `gorm:"type:int(1);" json:"status"` DataScope string `gorm:"-" json:"dataScope"` Params string `gorm:"-" json:"params"` - base.Model + BaseModel } type SysUser struct {