修复jeecg 2.3 管理员还是没有编辑用户管理的权限 #1729

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java

@@ -45,7 +45,7 @@ public class OSSFileController {
 
 
 	@ResponseBody
 	@ResponseBody
 	@PostMapping("/upload")
 	@PostMapping("/upload")
-	@RequiresRoles("admin")
+	//@RequiresRoles("admin")
 	public Result upload(@RequestParam("file") MultipartFile multipartFile) {
 	public Result upload(@RequestParam("file") MultipartFile multipartFile) {
 		Result result = new Result();
 		Result result = new Result();
 		try {
 		try {

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
 	 * @param quartzJob
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles("admin")
+	//@RequiresRoles("admin")
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	public Result<?> add(@RequestBody QuartzJob quartzJob) {
 	public Result<?> add(@RequestBody QuartzJob quartzJob) {
 		List<QuartzJob> list = quartzJobService.findByJobClassName(quartzJob.getJobClassName());
 		List<QuartzJob> list = quartzJobService.findByJobClassName(quartzJob.getJobClassName());
@@ -103,7 +103,7 @@ public class QuartzJobController {
 	 * @param quartzJob
 	 * @param quartzJob
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles("admin")
+	//@RequiresRoles("admin")
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
 	public Result<?> eidt(@RequestBody QuartzJob quartzJob) {
 	public Result<?> eidt(@RequestBody QuartzJob quartzJob) {
 		try {
 		try {
@@ -121,7 +121,7 @@ public class QuartzJobController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles("admin")
+	//@RequiresRoles("admin")
 	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
 	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
 	public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
 	public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
 		QuartzJob quartzJob = quartzJobService.getById(id);
 		QuartzJob quartzJob = quartzJobService.getById(id);
@@ -139,7 +139,7 @@ public class QuartzJobController {
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles("admin")
+	//@RequiresRoles("admin")
 	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
 	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
 	public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 	public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 		if (ids == null || "".equals(ids.trim())) {
 		if (ids == null || "".equals(ids.trim())) {
@@ -158,7 +158,7 @@ public class QuartzJobController {
 	 * @param jobClassName
 	 * @param jobClassName
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles("admin")
+	//@RequiresRoles("admin")
 	@GetMapping(value = "/pause")
 	@GetMapping(value = "/pause")
 	@ApiOperation(value = "暂停定时任务")
 	@ApiOperation(value = "暂停定时任务")
 	public Result<Object> pauseJob(@RequestParam(name = "jobClassName", required = true) String jobClassName) {
 	public Result<Object> pauseJob(@RequestParam(name = "jobClassName", required = true) String jobClassName) {
@@ -177,7 +177,7 @@ public class QuartzJobController {
 	 * @param jobClassName
 	 * @param jobClassName
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles("admin")
+	//@RequiresRoles("admin")
 	@GetMapping(value = "/resume")
 	@GetMapping(value = "/resume")
 	@ApiOperation(value = "恢复定时任务")
 	@ApiOperation(value = "恢复定时任务")
 	public Result<Object> resumeJob(@RequestParam(name = "jobClassName", required = true) String jobClassName) {
 	public Result<Object> resumeJob(@RequestParam(name = "jobClassName", required = true) String jobClassName) {
@@ -267,7 +267,7 @@ public class QuartzJobController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles("admin")
+	//@RequiresRoles("admin")
 	@GetMapping("/execute")
 	@GetMapping("/execute")
 	public Result<?> execute(@RequestParam(name = "id", required = true) String id) {
 	public Result<?> execute(@RequestParam(name = "id", required = true) String id) {
 		QuartzJob quartzJob = quartzJobService.getById(id);
 		QuartzJob quartzJob = quartzJobService.getById(id);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -130,7 +130,7 @@ public class SysUserController {
 	}
 	}
 
 
     //@RequiresRoles({"admin"})
     //@RequiresRoles({"admin"})
-    @RequiresPermissions("user:add")
+    //@RequiresPermissions("user:add")
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
 	public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
 		Result<SysUser> result = new Result<SysUser>();
 		Result<SysUser> result = new Result<SysUser>();
@@ -156,7 +156,7 @@ public class SysUserController {
 	}
 	}
 
 
     //@RequiresRoles({"admin"})
     //@RequiresRoles({"admin"})
-    @RequiresPermissions("user:edit")
+    //@RequiresPermissions("user:edit")
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
 	public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
 	public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
 		Result<SysUser> result = new Result<SysUser>();
 		Result<SysUser> result = new Result<SysUser>();
@@ -428,7 +428,7 @@ public class SysUserController {
      * @return
      * @return
      */
      */
     //@RequiresRoles({"admin"})
     //@RequiresRoles({"admin"})
-    @RequiresPermissions("user:import")
+    //@RequiresPermissions("user:import")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;