Commit 7e6527efd1f3fe42773cb43a9f995e8a53785f71
1 parent
e88fb503
取消用户功能的，权限注解
Showing
3 changed files
with
3 additions
and
8 deletions
jeecg-boot/.gitignore
0 → 100644
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
| @@ -217,7 +217,6 @@ public class SysPermissionController { | @@ -217,7 +217,6 @@ public class SysPermissionController { | ||
| 217 | * @param permission | 217 | * @param permission |
| 218 | * @return | 218 | * @return |
| 219 | */ | 219 | */ |
| 220 | - @RequiresRoles({ "admin" }) | ||
| 221 | @RequestMapping(value = "/add", method = RequestMethod.POST) | 220 | @RequestMapping(value = "/add", method = RequestMethod.POST) |
| 222 | public Result<SysPermission> add(@RequestBody SysPermission permission) { | 221 | public Result<SysPermission> add(@RequestBody SysPermission permission) { |
| 223 | Result<SysPermission> result = new Result<SysPermission>(); | 222 | Result<SysPermission> result = new Result<SysPermission>(); |
| @@ -237,7 +236,6 @@ public class SysPermissionController { | @@ -237,7 +236,6 @@ public class SysPermissionController { | ||
| 237 | * @param permission | 236 | * @param permission |
| 238 | * @return | 237 | * @return |
| 239 | */ | 238 | */ |
| 240 | - @RequiresRoles({ "admin" }) | ||
| 241 | @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST }) | 239 | @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST }) |
| 242 | public Result<SysPermission> edit(@RequestBody SysPermission permission) { | 240 | public Result<SysPermission> edit(@RequestBody SysPermission permission) { |
| 243 | Result<SysPermission> result = new Result<>(); | 241 | Result<SysPermission> result = new Result<>(); |
| @@ -257,7 +255,6 @@ public class SysPermissionController { | @@ -257,7 +255,6 @@ public class SysPermissionController { | ||
| 257 | * @param id | 255 | * @param id |
| 258 | * @return | 256 | * @return |
| 259 | */ | 257 | */ |
| 260 | - @RequiresRoles({ "admin" }) | ||
| 261 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) | 258 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) |
| 262 | public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) { | 259 | public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) { |
| 263 | Result<SysPermission> result = new Result<>(); | 260 | Result<SysPermission> result = new Result<>(); |
| @@ -277,7 +274,6 @@ public class SysPermissionController { | @@ -277,7 +274,6 @@ public class SysPermissionController { | ||
| 277 | * @param ids | 274 | * @param ids |
| 278 | * @return | 275 | * @return |
| 279 | */ | 276 | */ |
| 280 | - @RequiresRoles({ "admin" }) | ||
| 281 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) | 277 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) |
| 282 | public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { | 278 | public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { |
| 283 | Result<SysPermission> result = new Result<>(); | 279 | Result<SysPermission> result = new Result<>(); |
| @@ -375,7 +371,6 @@ public class SysPermissionController { | @@ -375,7 +371,6 @@ public class SysPermissionController { | ||
| 375 | * @return | 371 | * @return |
| 376 | */ | 372 | */ |
| 377 | @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST) | 373 | @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST) |
| 378 | - @RequiresRoles({ "admin" }) | ||
| 379 | public Result<String> saveRolePermission(@RequestBody JSONObject json) { | 374 | public Result<String> saveRolePermission(@RequestBody JSONObject json) { |
| 380 | long start = System.currentTimeMillis(); | 375 | long start = System.currentTimeMillis(); |
| 381 | Result<String> result = new Result<>(); | 376 | Result<String> result = new Result<>(); |
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
| @@ -112,7 +112,6 @@ public class SysUserController { | @@ -112,7 +112,6 @@ public class SysUserController { | ||
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | @RequestMapping(value = "/add", method = RequestMethod.POST) | 114 | @RequestMapping(value = "/add", method = RequestMethod.POST) |
| 115 | - @RequiresPermissions("user:add") | ||
| 116 | public Result<SysUser> add(@RequestBody JSONObject jsonObject) { | 115 | public Result<SysUser> add(@RequestBody JSONObject jsonObject) { |
| 117 | Result<SysUser> result = new Result<SysUser>(); | 116 | Result<SysUser> result = new Result<SysUser>(); |
| 118 | String selectedRoles = jsonObject.getString("selectedroles"); | 117 | String selectedRoles = jsonObject.getString("selectedroles"); |
| @@ -137,7 +136,6 @@ public class SysUserController { | @@ -137,7 +136,6 @@ public class SysUserController { | ||
| 137 | } | 136 | } |
| 138 | 137 | ||
| 139 | @RequestMapping(value = "/edit", method = RequestMethod.PUT) | 138 | @RequestMapping(value = "/edit", method = RequestMethod.PUT) |
| 140 | - @RequiresPermissions("user:edit") | ||
| 141 | public Result<SysUser> edit(@RequestBody JSONObject jsonObject) { | 139 | public Result<SysUser> edit(@RequestBody JSONObject jsonObject) { |
| 142 | Result<SysUser> result = new Result<SysUser>(); | 140 | Result<SysUser> result = new Result<SysUser>(); |
| 143 | try { | 141 | try { |
| @@ -399,7 +397,6 @@ public class SysUserController { | @@ -399,7 +397,6 @@ public class SysUserController { | ||
| 399 | * @param response | 397 | * @param response |
| 400 | * @return | 398 | * @return |
| 401 | */ | 399 | */ |
| 402 | - @RequiresPermissions("user:import") | ||
| 403 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) | 400 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
| 404 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { | 401 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
| 405 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; | 402 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; |