diff --git a/src/controller/login.go b/src/controller/login.go index d72b11409910eb26916acebe97a3b7291253f33f..a9a8909c7019dab6c35dc00a1e76341c4009e8a1 100644 --- a/src/controller/login.go +++ b/src/controller/login.go @@ -6,9 +6,7 @@ import ( "github.com/gin-gonic/gin" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/vo/request" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf" - "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/constant" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/resp" - "gitlab.wodcloud.com/smart-operation/so-operation-api/src/router/middleware/header" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/service" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/util" "go.uber.org/zap" @@ -283,7 +281,7 @@ func UserPhoneLogin(c *gin.Context) { } c.SetCookie(conf.CookieName, uuidStr, 1*60*60*24, "/", "", false, false) c.SetCookie(conf.CookieNameLastLogin, lastLogin, 1*60*60*24, "/", "", false, false) - header.AddUserLoginLog("登入", "phone/login", constant.OpTypeIntMap[constant.Login], c, userInfo) + //header.AddUserLoginLog("登入", "phone/login", constant.OpTypeIntMap[constant.Login], c, userInfo) SendJsonResponse(c, resp.OK, msg) } diff --git a/src/pkg/beagle/constant/constant.go b/src/pkg/beagle/constant/constant.go index 3d3e196b345c85eb5ba7151f7d2ad358952f0c25..2926a8458987c4c065c92c919ea52a094d60726a 100644 --- a/src/pkg/beagle/constant/constant.go +++ b/src/pkg/beagle/constant/constant.go @@ -84,9 +84,9 @@ const ( Login = OpType("登入") Logout = OpType("登出") AssignUser = OpType("分配用户") - UpMove = OpType("上移") - DownMove = OpType("下移") - Export = OpType("导出") + UpdateMove = OpType("上下移") + //DownMove = OpType("下移") + Export = OpType("导出") ) var OpTypeMap = map[int]OpType{ @@ -101,8 +101,8 @@ var OpTypeMap = map[int]OpType{ 9: Login, 10: Logout, 11: AssignUser, - 12: UpMove, - 13: DownMove, + 12: UpdateMove, + //13: DownMove, 14: Export, } @@ -118,9 +118,9 @@ var OpTypeIntMap = map[OpType]int{ Login: 9, Logout: 10, AssignUser: 11, - UpMove: 12, - DownMove: 13, - Export: 14, + UpdateMove: 12, + //DownMove: 13, + Export: 14, } // RiskLevel 风险等级 diff --git a/src/router/dict.go b/src/router/dict.go index 5f31d2d7125ffa1b7c4aef7754d998fd8bc2502a..834f21ea66d978cd57f326b0547c7e734a15f7f4 100644 --- a/src/router/dict.go +++ b/src/router/dict.go @@ -5,6 +5,7 @@ import ( "github.com/gin-gonic/gin" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/controller" + "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/constant" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/router/middleware/header" ) @@ -14,14 +15,14 @@ func initDictRoute(e *gin.Engine) { //系统字典 dict := new(controller.Dict) - base.POST("", dict.Add) //新增字典 - base.PUT("", dict.Update) //修改字典 - base.DELETE("", dict.Del) //删除字典 - base.GET("", dict.List) //字典列表 - base.GET("/tree", dict.DictTree) //字典列表-树结构 - base.GET("/classList", dict.ClassList) //字典分类列表 - base.PUT("/sort", dict.DictSort) //字典排序 - base.PUT("/status", dict.UpdateStatus) //字典排序 + base.POST("", header.AddLogMiddleware("字典管理", "/dict", constant.OpTypeIntMap[constant.Add]), dict.Add) //新增字典 + base.PUT("", header.AddLogMiddleware("字典管理", "/dict", constant.OpTypeIntMap[constant.Edit]), dict.Update) //修改字典 + base.DELETE("", header.AddLogMiddleware("字典管理", "/dict", constant.OpTypeIntMap[constant.Delete]), dict.Del) //删除字典 + base.GET("", header.AddLogMiddleware("字典管理", "/dict", constant.OpTypeIntMap[constant.Find]), dict.List) //字典列表 + base.GET("/tree", header.AddLogMiddleware("字典管理", "/dict/tree", constant.OpTypeIntMap[constant.Find]), dict.DictTree) //字典列表-树结构 + base.GET("/classList", header.AddLogMiddleware("字典管理", "/dict/classList", constant.OpTypeIntMap[constant.Find]), dict.ClassList) //字典分类列表 + base.PUT("/sort", header.AddLogMiddleware("字典管理", "/dict/sort", constant.OpTypeIntMap[constant.UpdateMove]), dict.DictSort) //字典排序 + base.PUT("/status", header.AddLogMiddleware("字典管理", "/dict/status", constant.OpTypeIntMap[constant.Edit]), dict.UpdateStatus) //字典状态 //base.GET("/manage_list", dict.ManageList) //字典管理列表 diff --git a/src/router/organizationrouter.go b/src/router/organizationrouter.go index 99911f62cf41f8828232defbac580c55a3588ae6..594d193e743c7d4180cee6b2350dd5fd5a6dceec 100644 --- a/src/router/organizationrouter.go +++ b/src/router/organizationrouter.go @@ -4,6 +4,7 @@ import ( "fmt" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/controller" + "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/constant" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/router/middleware/header" "github.com/gin-gonic/gin" @@ -13,11 +14,11 @@ import ( func InitOrganizationRouter(e *gin.Engine) { base := e.Group(fmt.Sprintf("%s/org", conf.Options.Prefix), header.SetContext) { - base.POST("/add", controller.AddOrg) //新增组织or目录 - base.PUT("/:id", controller.UpdateOrg) //更新组织或目录 - base.DELETE("/:id", controller.DeleteOrg) //删除组织或者目录 - base.PUT("/sort", controller.SortOrg) //组织排序 - base.GET("/tree", controller.GetOrgTree) //查询组织树 - base.GET("/detail", controller.OrgDetail) //查询组织详情 + base.POST("/add", header.AddLogMiddleware("组织管理", "/org/add", constant.OpTypeIntMap[constant.Add]), controller.AddOrg) //新增组织or目录 + base.PUT("/:id", header.AddLogMiddleware("组织管理", "/org", constant.OpTypeIntMap[constant.Edit]), controller.UpdateOrg) //更新组织或目录 + base.DELETE("/:id", header.AddLogMiddleware("组织管理", "/org", constant.OpTypeIntMap[constant.Delete]), controller.DeleteOrg) //删除组织或者目录 + base.PUT("/sort", header.AddLogMiddleware("组织管理", "/org/sort", constant.OpTypeIntMap[constant.UpdateMove]), controller.SortOrg) //组织排序 + base.GET("/tree", header.AddLogMiddleware("组织管理", "/org/tree", constant.OpTypeIntMap[constant.Find]), controller.GetOrgTree) //查询组织树 + base.GET("/detail", header.AddLogMiddleware("组织管理", "/org/detail", constant.OpTypeIntMap[constant.Find]), controller.OrgDetail) //查询组织详情 } } diff --git a/src/router/system_access_rule.go b/src/router/system_access_rule.go index b265288564e41e4373aa731c209884010664bfef..59b50a22c64e2701b55286bf24543eddb2d60bf2 100644 --- a/src/router/system_access_rule.go +++ b/src/router/system_access_rule.go @@ -13,12 +13,12 @@ import ( func InitAccessRuleRouter(e *gin.Engine) { rule := e.Group(fmt.Sprintf("%s/accessRule", conf.Options.Prefix), header.SetContext) { - rule.POST("addAccessRule", controller.AddAccessRule, header.AddLogMiddleware("访问规则管理", "/addAccessRule", constant.OpTypeIntMap[constant.Add])) // 新增访问规则 - rule.PUT("updateAccessRule", controller.UpdateAccessRule, header.AddLogMiddleware("访问规则管理", "/updateAccessRule", constant.OpTypeIntMap[constant.Edit])) // 编辑访问规则 - rule.DELETE("delAccessRule", controller.DelAccessRule, header.AddLogMiddleware("访问规则管理", "/delAccessRule", constant.OpTypeIntMap[constant.AllDelete])) // 删除访问规则 - rule.GET("listAccessRule", controller.ListAccessRule, header.AddLogMiddleware("访问规则管理", "/listAccessRule", constant.OpTypeIntMap[constant.Find])) // 查询访问规则列表 + rule.POST("addAccessRule", header.AddLogMiddleware("访问规则管理", "/addAccessRule", constant.OpTypeIntMap[constant.Add]), controller.AddAccessRule) // 新增访问规则 + rule.PUT("updateAccessRule", header.AddLogMiddleware("访问规则管理", "/updateAccessRule", constant.OpTypeIntMap[constant.Edit]), controller.UpdateAccessRule) // 编辑访问规则 + rule.DELETE("delAccessRule", header.AddLogMiddleware("访问规则管理", "/delAccessRule", constant.OpTypeIntMap[constant.AllDelete]), controller.DelAccessRule) // 删除访问规则 + rule.GET("listAccessRule", header.AddLogMiddleware("访问规则管理", "/listAccessRule", constant.OpTypeIntMap[constant.Find]), controller.ListAccessRule) // 查询访问规则列表 rule.GET("listRuleUser", controller.ListRuleUser) // 查询用户详情列表 - rule.PUT("updateState", controller.UpdateState) // 修改规则状态 + rule.PUT("updateState", header.AddLogMiddleware("访问规则管理", "/updateState", constant.OpTypeIntMap[constant.Edit]), controller.UpdateState) // 修改规则状态 } } diff --git a/src/router/systemmenurouter.go b/src/router/systemmenurouter.go index 695b0938c001d00887e96b619f45c8a92d96e542..8f427b675bb5f81c8fe73873be1f98621c2436cc 100644 --- a/src/router/systemmenurouter.go +++ b/src/router/systemmenurouter.go @@ -4,6 +4,7 @@ import ( "fmt" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/controller" + "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/constant" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/router/middleware/header" "github.com/gin-gonic/gin" @@ -13,12 +14,12 @@ func InitSystemMenuRouter(e *gin.Engine) { base := e.Group(fmt.Sprintf("%s/menu", conf.Options.Prefix), header.SetContext) { - base.GET("/group/dict", controller.GetGroupDict) //获取字典分组 - base.POST("/add", controller.AddSystemMenu) //新增菜单 - base.PUT("/:id", controller.UpdateMenu) //菜单更新 - base.GET("/tree", controller.GetMenuTree) //获取菜单树形结构 - base.PUT("/sort", controller.MenuSort) //菜单排序 - base.DELETE("/:id", controller.DeleteMenu) //删除菜单 - base.GET("/user/tree", controller.GetSystemTree) //获取当前系统用户树 + base.GET("/group/dict", header.AddLogMiddleware("菜单管理", "/menu/group/dict", constant.OpTypeIntMap[constant.Find]), controller.GetGroupDict) //获取字典分组 + base.POST("/add", header.AddLogMiddleware("菜单管理", "/menu/add", constant.OpTypeIntMap[constant.Add]), controller.AddSystemMenu) //新增菜单 + base.PUT("/:id", header.AddLogMiddleware("菜单管理", "/menu", constant.OpTypeIntMap[constant.Edit]), controller.UpdateMenu) //菜单更新 + base.GET("/tree", header.AddLogMiddleware("菜单管理", "/menu/tree", constant.OpTypeIntMap[constant.Find]), controller.GetMenuTree) //获取菜单树形结构 + base.PUT("/sort", header.AddLogMiddleware("菜单管理", "/menu/sort", constant.OpTypeIntMap[constant.UpdateMove]), controller.MenuSort) //菜单排序 + base.DELETE("/:id", header.AddLogMiddleware("菜单管理", "/menu", constant.OpTypeIntMap[constant.Delete]), controller.DeleteMenu) //删除菜单 + base.GET("/user/tree", header.AddLogMiddleware("菜单管理", "/menu/user/tree", constant.OpTypeIntMap[constant.Find]), controller.GetSystemTree) //获取当前系统用户树 } } diff --git a/src/router/systempreferencerouter.go b/src/router/systempreferencerouter.go index fc3fa84fa0db191a4babb38fa2fe0d5d230f1dbd..52237d5ef6e4c8b1efa682d64f6ee5808c2ba31b 100644 --- a/src/router/systempreferencerouter.go +++ b/src/router/systempreferencerouter.go @@ -5,6 +5,7 @@ import ( "github.com/gin-gonic/gin" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/controller" + "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/constant" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/router/middleware/header" ) @@ -12,13 +13,13 @@ import ( func InitPreferenceConfigRouter(e *gin.Engine) { sys := e.Group(fmt.Sprintf("%s/sysOptions", conf.Options.Prefix), header.SetContext) { - sys.POST("licenseOpts", controller.SetLicenseOptions) // 设置授权信息 - sys.POST("loginPageOpts", controller.SetLoginPageOptions) // 设置授权信息 - sys.POST("safeOpts", controller.SetSafeOptions) // 设置安全选项 - sys.POST("loginOpts", controller.SetLoginOptions) // 设置登录选项 - sys.GET("checkLicense", controller.CheckLicense) // 校验license是否有效 - sys.POST("reStartConfig", controller.ReStartConfig) // 一键还原受限 - sys.POST("getLicenseInfo", controller.GetLicenseInfo) // 获取license信息 + sys.POST("licenseOpts", header.AddLogMiddleware("首选项管理", "/sysOptions/licenseOpts", constant.OpTypeIntMap[constant.Edit]), controller.SetLicenseOptions) // 设置授权信息 + sys.POST("loginPageOpts", header.AddLogMiddleware("首选项管理", "/sysOptions/loginPageOpts", constant.OpTypeIntMap[constant.Edit]), controller.SetLoginPageOptions) // 设置授权信息 + sys.POST("safeOpts", header.AddLogMiddleware("首选项管理", "/sysOptions/safeOpts", constant.OpTypeIntMap[constant.Edit]), controller.SetSafeOptions) // 设置安全选项 + sys.POST("loginOpts", header.AddLogMiddleware("首选项管理", "/sysOptions/loginOpts", constant.OpTypeIntMap[constant.Edit]), controller.SetLoginOptions) // 设置登录选项 + sys.GET("checkLicense", header.AddLogMiddleware("首选项管理", "/sysOptions/checkLicense", constant.OpTypeIntMap[constant.Edit]), controller.CheckLicense) // 校验license是否有效 + sys.POST("reStartConfig", header.AddLogMiddleware("首选项管理", "/sysOptions/reStartConfig", constant.OpTypeIntMap[constant.Edit]), controller.ReStartConfig) // 一键还原受限 + sys.POST("getLicenseInfo", header.AddLogMiddleware("首选项管理", "/sysOptions/getLicenseInfo", constant.OpTypeIntMap[constant.Edit]), controller.GetLicenseInfo) // 获取license信息 } notLoginSys := e.Group(fmt.Sprintf("%s/sysOptions", conf.Options.Prefix)) diff --git a/src/router/systemrolerouter.go b/src/router/systemrolerouter.go index 4013604b419bb3609dee188ca9788cf48fd018cc..d4100f3da0f1d5988e96d26a0b381a967d3916a5 100644 --- a/src/router/systemrolerouter.go +++ b/src/router/systemrolerouter.go @@ -4,6 +4,7 @@ import ( "fmt" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/controller" + "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/constant" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/router/middleware/header" "github.com/gin-gonic/gin" @@ -14,13 +15,13 @@ func InitSystemRoleRouter(e *gin.Engine) { base := e.Group(fmt.Sprintf("%s/role", conf.Options.Prefix), header.SetContext) { - base.PUT("create", controller.CreateSystemRole) // 添加系统角色 - base.POST("update", controller.UpdateSystemRole) // 编辑系统角色 - base.POST("state/:id/:state", controller.SystemRoleState) // 系统角色状态 - base.GET("list", controller.SystemRoleList) // 系统角色列表 - base.GET("detail/:id", controller.SystemRoleDetail) // 系统角色详情 - base.POST("allotment/user", controller.SystemRoleAllotmentUser) // 角色分配账户 - base.GET("allotment/list", controller.SystemAllotUserList) // 角色可分配账户列表 - base.DELETE("delete", controller.DeleteSystemRole) // 删除系统角色 + base.PUT("create", header.AddLogMiddleware("角色管理", "/role/create", constant.OpTypeIntMap[constant.Add]), controller.CreateSystemRole) // 添加系统角色 + base.POST("update", header.AddLogMiddleware("角色管理", "/role/update", constant.OpTypeIntMap[constant.Edit]), controller.UpdateSystemRole) // 编辑系统角色 + base.POST("state/:id/:state", header.AddLogMiddleware("角色管理", "/role/state", constant.OpTypeIntMap[constant.Edit]), controller.SystemRoleState) // 系统角色状态 + base.GET("list", header.AddLogMiddleware("角色管理", "/role/list", constant.OpTypeIntMap[constant.Find]), controller.SystemRoleList) // 系统角色列表 + base.GET("detail/:id", header.AddLogMiddleware("角色管理", "/role/detail", constant.OpTypeIntMap[constant.Find]), controller.SystemRoleDetail) // 系统角色详情 + base.POST("allotment/user", header.AddLogMiddleware("角色管理", "/role/allotment/user", constant.OpTypeIntMap[constant.Find]), controller.SystemRoleAllotmentUser) // 角色分配账户 + base.GET("allotment/list", header.AddLogMiddleware("角色管理", "/role/allotment/list", constant.OpTypeIntMap[constant.Find]), controller.SystemAllotUserList) // 角色可分配账户列表 + base.DELETE("delete", header.AddLogMiddleware("角色管理", "/role/delete", constant.OpTypeIntMap[constant.AllDelete]), controller.DeleteSystemRole) // 删除系统角色 } } diff --git a/src/router/systemuserrouter.go b/src/router/systemuserrouter.go index 9bcdf793163d982c278f5feafb9e755844d71d12..de9a083b9921155a07347fe2086b5b73f87bb8d0 100644 --- a/src/router/systemuserrouter.go +++ b/src/router/systemuserrouter.go @@ -4,6 +4,7 @@ import ( "fmt" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/controller" + "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/constant" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/router/middleware/header" "github.com/gin-gonic/gin" @@ -15,17 +16,17 @@ func InitSystemUserRouter(e *gin.Engine) { { - base.GET("/:id", controller.OrgUserDetail) //查询组织用户详情 - base.GET("/select/role", controller.OrgUserRoles) //注册平台用户使用的查询角色列表 - base.POST("/add", controller.OrgAddUser) //添加组织用户 - base.PUT("/:id", controller.OrgUpdateUser) //组织编辑用户 - base.DELETE("/del", controller.DelOrgUser) //删除组织用户 - base.POST("/check", controller.CheckRepetition) //去重校验 - base.GET("/devOps", controller.DevOps) //运维人员列表 + base.GET("/:id", header.AddLogMiddleware("用户管理", "/user", constant.OpTypeIntMap[constant.Find]), controller.OrgUserDetail) //查询组织用户详情 + base.GET("/select/role", header.AddLogMiddleware("用户管理", "/user/select/role", constant.OpTypeIntMap[constant.Find]), controller.OrgUserRoles) //注册平台用户使用的查询角色列表 + base.POST("/add", header.AddLogMiddleware("用户管理", "/user/add", constant.OpTypeIntMap[constant.Add]), controller.OrgAddUser) //添加组织用户 + base.PUT("/:id", header.AddLogMiddleware("用户管理", "/user", constant.OpTypeIntMap[constant.Edit]), controller.OrgUpdateUser) //组织编辑用户 + base.DELETE("/del", header.AddLogMiddleware("用户管理", "/user/del", constant.OpTypeIntMap[constant.AllDelete]), controller.DelOrgUser) //删除组织用户 + base.POST("/check", header.AddLogMiddleware("用户管理", "/user/check", constant.OpTypeIntMap[constant.Find]), controller.CheckRepetition) //去重校验 + base.GET("/devOps", header.AddLogMiddleware("用户管理", "/user/devOps", constant.OpTypeIntMap[constant.Find]), controller.DevOps) //运维人员列表 - base.POST("/updatePwd", controller.SystemUserEditPassword) // 修改账户密码 - base.POST("/resetPwd", controller.ResetSystemUserPassword) // 重置账户密码 - base.POST("/updateState", controller.SystemUserUpdateState) // 重置账户密码 + base.POST("/updatePwd", header.AddLogMiddleware("用户管理", "/user/updatePwd", constant.OpTypeIntMap[constant.UpdatePwd]), controller.SystemUserEditPassword) // 修改账户密码 + base.POST("/resetPwd", header.AddLogMiddleware("用户管理", "/user/resetPwd", constant.OpTypeIntMap[constant.ResetPwd]), controller.ResetSystemUserPassword) // 重置账户密码 + base.POST("/updateState", header.AddLogMiddleware("用户管理", "/user/updateState", constant.OpTypeIntMap[constant.Edit]), controller.SystemUserUpdateState) // 更新用户状态 } }