Jeecg-Boot 2.2.0 版本发布 | 重磅升级

jeecg-boot/.gitignore

 /target/
 /target/
 /.idea/
 /.idea/
-*.iml
+*.iml
\ No newline at end of file
+rebel.xml
\ No newline at end of file

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) {
@@ -183,7 +183,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) {

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")
     @GetMapping("/require_role")
-    @RequiresRoles("admin")
+    @RequiresRoles({"admin"})
     public ResponseBean requireRole() {
     public ResponseBean requireRole() {
         return new ResponseBean(200, "You are visiting require_role", null);
         return new ResponseBean(200, "You are visiting require_role", null);
     }
     }

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
 	 * @param permission
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles({ "admin" })
+	//@RequiresRoles({"admin"})
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	public Result<SysPermission> add(@RequestBody SysPermission permission) {
 	public Result<SysPermission> add(@RequestBody SysPermission permission) {
 		Result<SysPermission> result = new Result<SysPermission>();
 		Result<SysPermission> result = new Result<SysPermission>();
@@ -266,7 +266,7 @@ public class SysPermissionController {
 	 * @param permission
 	 * @param permission
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles({ "admin" })
+	//@RequiresRoles({"admin"})
 	@RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
 	@RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
 	public Result<SysPermission> edit(@RequestBody SysPermission permission) {
 	public Result<SysPermission> edit(@RequestBody SysPermission permission) {
 		Result<SysPermission> result = new Result<>();
 		Result<SysPermission> result = new Result<>();
@@ -286,7 +286,7 @@ public class SysPermissionController {
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles({ "admin" })
+	//@RequiresRoles({"admin"})
 	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
 	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
 	public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
 	public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
 		Result<SysPermission> result = new Result<>();
 		Result<SysPermission> result = new Result<>();
@@ -305,7 +305,7 @@ public class SysPermissionController {
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequiresRoles({ "admin" })
+	//@RequiresRoles({"admin"})
 	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
 	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
 	public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 	public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 		Result<SysPermission> result = new Result<>();
 		Result<SysPermission> result = new Result<>();
@@ -403,7 +403,7 @@ public class SysPermissionController {
 	 * @return
 	 * @return
 	 */
 	 */
 	@RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST)
 	@RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST)
-	@RequiresRoles({ "admin" })
+	//@RequiresRoles({"admin"})
 	public Result<String> saveRolePermission(@RequestBody JSONObject json) {
 	public Result<String> saveRolePermission(@RequestBody JSONObject json) {
 		long start = System.currentTimeMillis();
 		long start = System.currentTimeMillis();
 		Result<String> result = new Result<>();
 		Result<String> result = new Result<>();
@@ -773,7 +773,7 @@ public class SysPermissionController {
 	 * @return
 	 * @return
 	 */
 	 */
 	@RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST)
 	@RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST)
-	@RequiresRoles({ "admin" })
+	//@RequiresRoles({"admin"})
 	public Result<String> saveDepartPermission(@RequestBody JSONObject json) {
 	public Result<String> saveDepartPermission(@RequestBody JSONObject json) {
 		long start = System.currentTimeMillis();
 		long start = System.currentTimeMillis();
 		Result<String> result = new Result<>();
 		Result<String> result = new Result<>();

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)
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
-    @RequiresPermissions("user:add")
+    //@RequiresPermissions("user:add")
 	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>();
 		String selectedRoles = jsonObject.getString("selectedroles");
 		String selectedRoles = jsonObject.getString("selectedroles");
@@ -426,7 +426,7 @@ public class SysUserController {
      * @param response
      * @param response
      * @return
      * @return
      */
      */
-    @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) {
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;