diff --git a/jeecg-boot/.gitignore b/jeecg-boot/.gitignore index d3172cc..b144cb4 100644 --- a/jeecg-boot/.gitignore +++ b/jeecg-boot/.gitignore @@ -1,3 +1,4 @@ /target/ /.idea/ -*.iml \ No newline at end of file +*.iml +rebel.xml \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java index 949cb2e..668ae72 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java @@ -45,7 +45,7 @@ public class OSSFileController { @ResponseBody @PostMapping("/upload") - @RequiresRoles("admin") + //@RequiresRoles({"admin"}) public Result upload(@RequestParam("file") MultipartFile multipartFile) { Result result = new Result(); try { diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java index 9fd5782..1efa9a2 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java @@ -86,7 +86,7 @@ public class QuartzJobController { * @param quartzJob * @return */ - @RequiresRoles("admin") + //@RequiresRoles({"admin"}) @RequestMapping(value = "/add", method = RequestMethod.POST) public Result<?> add(@RequestBody QuartzJob quartzJob) { List<QuartzJob> list = quartzJobService.findByJobClassName(quartzJob.getJobClassName()); @@ -103,7 +103,7 @@ public class QuartzJobController { * @param quartzJob * @return */ - @RequiresRoles("admin") + //@RequiresRoles({"admin"}) @RequestMapping(value = "/edit", method = RequestMethod.PUT) public Result<?> eidt(@RequestBody QuartzJob quartzJob) { try { @@ -121,7 +121,7 @@ public class QuartzJobController { * @param id * @return */ - @RequiresRoles("admin") + //@RequiresRoles({"admin"}) @RequestMapping(value = "/delete", method = RequestMethod.DELETE) public Result<?> delete(@RequestParam(name = "id", required = true) String id) { QuartzJob quartzJob = quartzJobService.getById(id); @@ -139,7 +139,7 @@ public class QuartzJobController { * @param ids * @return */ - @RequiresRoles("admin") + //@RequiresRoles({"admin"}) @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { if (ids == null || "".equals(ids.trim())) { @@ -158,7 +158,7 @@ public class QuartzJobController { * @param jobClassName * @return */ - @RequiresRoles("admin") + //@RequiresRoles({"admin"}) @GetMapping(value = "/pause") @ApiOperation(value = "暂停定时任务") public Result<Object> pauseJob(@RequestParam(name = "jobClassName", required = true) String jobClassName) { @@ -183,7 +183,7 @@ public class QuartzJobController { * @param jobClassName * @return */ - @RequiresRoles("admin") + //@RequiresRoles({"admin"}) @GetMapping(value = "/resume") @ApiOperation(value = "恢复定时任务") public Result<Object> resumeJob(@RequestParam(name = "jobClassName", required = true) String jobClassName) { diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java index 35c9db3..4ce506e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/web/TestWebController.java @@ -63,7 +63,7 @@ public class TestWebController { } @GetMapping("/require_role") - @RequiresRoles("admin") + @RequiresRoles({"admin"}) public ResponseBean requireRole() { return new ResponseBean(200, "You are visiting require_role", null); } diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java index 1787e4a..14bfba0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java @@ -246,7 +246,7 @@ public class SysPermissionController { * @param permission * @return */ - @RequiresRoles({ "admin" }) + //@RequiresRoles({"admin"}) @RequestMapping(value = "/add", method = RequestMethod.POST) public Result<SysPermission> add(@RequestBody SysPermission permission) { Result<SysPermission> result = new Result<SysPermission>(); @@ -266,7 +266,7 @@ public class SysPermissionController { * @param permission * @return */ - @RequiresRoles({ "admin" }) + //@RequiresRoles({"admin"}) @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST }) public Result<SysPermission> edit(@RequestBody SysPermission permission) { Result<SysPermission> result = new Result<>(); @@ -286,7 +286,7 @@ public class SysPermissionController { * @param id * @return */ - @RequiresRoles({ "admin" }) + //@RequiresRoles({"admin"}) @RequestMapping(value = "/delete", method = RequestMethod.DELETE) public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) { Result<SysPermission> result = new Result<>(); @@ -305,7 +305,7 @@ public class SysPermissionController { * @param ids * @return */ - @RequiresRoles({ "admin" }) + //@RequiresRoles({"admin"}) @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { Result<SysPermission> result = new Result<>(); @@ -403,7 +403,7 @@ public class SysPermissionController { * @return */ @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST) - @RequiresRoles({ "admin" }) + //@RequiresRoles({"admin"}) public Result<String> saveRolePermission(@RequestBody JSONObject json) { long start = System.currentTimeMillis(); Result<String> result = new Result<>(); @@ -773,7 +773,7 @@ public class SysPermissionController { * @return */ @RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST) - @RequiresRoles({ "admin" }) + //@RequiresRoles({"admin"}) public Result<String> saveDepartPermission(@RequestBody JSONObject json) { long start = System.currentTimeMillis(); Result<String> result = new Result<>(); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 177d208..4535551 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -130,7 +130,7 @@ public class SysUserController { } @RequestMapping(value = "/add", method = RequestMethod.POST) - @RequiresPermissions("user:add") + //@RequiresPermissions("user:add") public Result<SysUser> add(@RequestBody JSONObject jsonObject) { Result<SysUser> result = new Result<SysUser>(); String selectedRoles = jsonObject.getString("selectedroles"); @@ -426,7 +426,7 @@ public class SysUserController { * @param response * @return */ - @RequiresPermissions("user:import") + //@RequiresPermissions("user:import") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;