From 31111fe3b65a52cdb9aa694194a6b1b7e9670e2b Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 14 Sep 2020 14:33:23 +0800
Subject: [PATCH] 修复jeecg 2.3 管理员还是没有编辑用户管理的权限 #1729

---
 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java      |  2 +-
 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java | 14 +++++++-------
 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java   |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

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..f13d3e5 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 13badc5..fa263e8 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) {
@@ -177,7 +177,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) {
@@ -267,7 +267,7 @@ public class QuartzJobController {
 	 * @param id
 	 * @return
 	 */
-	@RequiresRoles("admin")
+	//@RequiresRoles("admin")
 	@GetMapping("/execute")
 	public Result<?> execute(@RequestParam(name = "id", required = true) String id) {
 		QuartzJob quartzJob = quartzJobService.getById(id);
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 99283f8..b5f2167 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 {
 	}
 
     //@RequiresRoles({"admin"})
-    @RequiresPermissions("user:add")
+    //@RequiresPermissions("user:add")
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
 		Result<SysUser> result = new Result<SysUser>();
@@ -156,7 +156,7 @@ public class SysUserController {
 	}
 
     //@RequiresRoles({"admin"})
-    @RequiresPermissions("user:edit")
+    //@RequiresPermissions("user:edit")
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
 	public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
 		Result<SysUser> result = new Result<SysUser>();
@@ -428,7 +428,7 @@ public class SysUserController {
      * @return
      */
     //@RequiresRoles({"admin"})
-    @RequiresPermissions("user:import")
+    //@RequiresPermissions("user:import")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
--
libgit2 0.22.2