From 6f72ed99bef3edddc45974f686c20fb0a717ca47 Mon Sep 17 00:00:00 2001 From: mzc5649 <13027087095@163.com> Date: Mon, 19 Apr 2021 10:18:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=E4=BF=AE=E6=94=B9shiro?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCategoryController.java | 10 +++---- .../controller/SysDepartController.java | 12 ++++----- .../system/controller/SysDictController.java | 12 ++++----- .../system/controller/SysRoleController.java | 12 ++++----- .../system/controller/SysUserController.java | 26 +++++++++---------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 0c20e96e..3385a854 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -96,7 +96,7 @@ public class SysCategoryController { * @param sysCategory * @return */ - @RequiresPermissions("sys:category:list") + @RequiresPermissions("sys:category:add") @PostMapping(value = "/add") public Result add(@RequestBody SysCategory sysCategory) { Result result = new Result(); @@ -115,7 +115,7 @@ public class SysCategoryController { * @param sysCategory * @return */ - @RequiresPermissions("sys:category:list") + @RequiresPermissions("sys:category:edit") @PutMapping(value = "/edit") public Result edit(@RequestBody SysCategory sysCategory) { Result result = new Result(); @@ -154,7 +154,7 @@ public class SysCategoryController { * @param ids * @return */ - @RequiresPermissions("sys:category:list") + @RequiresPermissions("sys:category:del") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); @@ -191,7 +191,7 @@ public class SysCategoryController { * * @param request */ - @RequiresPermissions("sys:category:list") + @RequiresPermissions("sys:category:export") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, SysCategory sysCategory) { // Step.1 组装查询条件查询数据 @@ -223,7 +223,7 @@ public class SysCategoryController { * @param response * @return */ - @RequiresPermissions("sys:category:list") + @RequiresPermissions("sys:category:import") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 6048bc72..745b0071 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -119,7 +119,7 @@ public class SysDepartController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:depart:list") + @RequiresPermissions("sys:depart:add") @RequestMapping(value = "/add", method = RequestMethod.POST) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Result add(@RequestBody SysDepart sysDepart, HttpServletRequest request) { @@ -146,7 +146,7 @@ public class SysDepartController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:depart:list") + @RequiresPermissions("sys:depart:edit") @RequestMapping(value = "/edit", method = RequestMethod.PUT) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Result edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) { @@ -175,7 +175,7 @@ public class SysDepartController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:depart:list") + @RequiresPermissions("sys:depart:del") @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Result delete(@RequestParam(name="id",required=true) String id) { @@ -204,7 +204,7 @@ public class SysDepartController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:depart:list") + @RequiresPermissions("sys:depart:del") @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -291,7 +291,7 @@ public class SysDepartController { * * @param request */ - @RequiresPermissions("sys:depart:list") + @RequiresPermissions("sys:depart:export") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(SysDepart sysDepart,HttpServletRequest request) { // Step.1 组装查询条件 @@ -323,7 +323,7 @@ public class SysDepartController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:depart:list") + @RequiresPermissions("sys:depart:import") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index da1dc74c..f050cb4a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -334,7 +334,7 @@ public class SysDictController { * @param sysDict * @return */ - @RequiresPermissions("sys:dict:list") + @RequiresPermissions("sys:dict:add") @ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典") @RequiresRoles({"admin"}) @RequestMapping(value = "/add", method = RequestMethod.POST) @@ -359,7 +359,7 @@ public class SysDictController { * @param sysDict * @return */ - @RequiresPermissions("sys:dict:list") + @RequiresPermissions("sys:dict:edit") @ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典") @RequiresRoles({"admin"}) @RequestMapping(value = "/edit", method = RequestMethod.PUT) @@ -385,7 +385,7 @@ public class SysDictController { * @param id * @return */ - @RequiresPermissions("sys:dict:list") + @RequiresPermissions("sys:dict:del") @ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典") @RequiresRoles({"admin"}) @DeleteMapping(value = "/delete") @@ -406,7 +406,7 @@ public class SysDictController { * @param ids * @return */ - @RequiresPermissions("sys:dict:list") + @RequiresPermissions("sys:dict:del") @ApiOperation(value = "字典控制器-批量字典", notes = "字典控制器-批量字典") @DeleteMapping(value = "/deleteBatch") @CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true) @@ -439,7 +439,7 @@ public class SysDictController { * * @param request */ - @RequiresPermissions("sys:dict:list") + @RequiresPermissions("sys:dict:export") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(SysDict sysDict, HttpServletRequest request) { // Step.1 组装查询条件 @@ -477,7 +477,7 @@ public class SysDictController { * @param * @return */ - @RequiresPermissions("sys:dict:list") + @RequiresPermissions("sys:dict:import") @RequiresRoles({"admin"}) @PostMapping(value = "/importExcel") public Result importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index 764db82e..6c9ea0e4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -110,7 +110,7 @@ public class SysRoleController { * @param role * @return */ - @RequiresPermissions("sys:role:list") + @RequiresPermissions("sys:role:add") @RequestMapping(value = "/add", method = RequestMethod.POST) //@RequiresRoles({"admin"}) public Result add(@RequestBody SysRole role) { @@ -132,7 +132,7 @@ public class SysRoleController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:role:list") + @RequiresPermissions("sys:role:edit") @RequestMapping(value = "/edit", method = RequestMethod.PUT) public Result edit(@RequestBody SysRole role) { Result result = new Result(); @@ -157,7 +157,7 @@ public class SysRoleController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:role:list") + @RequiresPermissions("sys:role:del") @RequestMapping(value = "/delete", method = RequestMethod.DELETE) public Result delete(@RequestParam(name="id",required=true) String id) { sysRoleService.deleteRole(id); @@ -170,7 +170,7 @@ public class SysRoleController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:role:list") + @RequiresPermissions("sys:role:del") @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); @@ -258,7 +258,7 @@ public class SysRoleController { * 导出excel * @param request */ - @RequiresPermissions("sys:role:list") + @RequiresPermissions("sys:role:export") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(SysRole sysRole,HttpServletRequest request) { // Step.1 组装查询条件 @@ -281,7 +281,7 @@ public class SysRoleController { * @param response * @return */ - @RequiresPermissions("sys:role:list") + @RequiresPermissions("sys:role:import") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 18b64d70..8a6c035c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -191,7 +191,7 @@ public class SysUserController { * 删除用户 */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:del") @RequestMapping(value = "/delete", method = RequestMethod.DELETE) public Result delete(@RequestParam(name="id",required=true) String id) { baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3); @@ -203,7 +203,7 @@ public class SysUserController { * 批量删除用户 */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:del") @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3); @@ -306,7 +306,7 @@ public class SysUserController { * 修改密码 */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("user:edit") @RequestMapping(value = "/changePassword", method = RequestMethod.PUT) public Result changePassword(@RequestBody SysUser sysUser) { SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper().eq(SysUser::getUsername, sysUser.getUsername())); @@ -406,7 +406,7 @@ public class SysUserController { * @param request * @param sysUser */ - @RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:export") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) { // Step.1 组装查询条件 @@ -440,7 +440,7 @@ public class SysUserController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("user:import") + @RequiresPermissions("sys:user:import") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; @@ -569,7 +569,7 @@ public class SysUserController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("user:add") @RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST) public Result addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) { Result result = new Result(); @@ -601,7 +601,7 @@ public class SysUserController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:del") @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE) public Result deleteUserRole(@RequestParam(name="roleId") String roleId, @RequestParam(name="userId",required=true) String userId @@ -626,7 +626,7 @@ public class SysUserController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:del") @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE) public Result deleteUserRoleBatch( @RequestParam(name="roleId") String roleId, @@ -710,7 +710,7 @@ public class SysUserController { * 给指定部门添加对应的用户 */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("user:add") @RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST) public Result editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) { Result result = new Result(); @@ -740,7 +740,7 @@ public class SysUserController { * 删除指定机构的用户关系 */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:del") @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE) public Result deleteUserInDepart(@RequestParam(name="depId") String depId, @RequestParam(name="userId",required=true) String userId @@ -773,7 +773,7 @@ public class SysUserController { * 批量删除指定机构的用户关系 */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:del") @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE) public Result deleteUserInDepartBatch( @RequestParam(name="depId") String depId, @@ -1129,7 +1129,7 @@ public class SysUserController { * @return */ //@RequiresRoles({"admin"}) - @RequiresPermissions("sys:user:list") + @RequiresPermissions("sys:user:del") @RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE) public Result deleteRecycleBin(@RequestParam("userIds") String userIds) { if (StringUtils.isNotBlank(userIds)) { @@ -1144,7 +1144,7 @@ public class SysUserController { * @param jsonObject * @return */ - @RequiresPermissions("sys:user:list") + @RequiresPermissions("user:edit") @RequestMapping(value = "/appEdit", method = RequestMethod.PUT) public Result appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) { Result result = new Result();