wms / wms4_globaltaiguogeli · Commits

Commit aa65d6a45f48e1c6fc90ccea7b46fe30caee7118

Authored by zhangdaiscott
1 parent 98700817
develop

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

Inline Side-by-side
Showing 6 changed files with 18 additions and 17 deletions
jeecg-boot/.gitignore
  View file @aa65d6a
1 1 /target/
2 2 /.idea/
3   -*.iml
4 3 \ No newline at end of file
  4 +*.iml
  5 +rebel.xml
5 6 \ No newline at end of file
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oss/controller/OSSFileController.java
  View file @aa65d6a
... ... @@ -45,7 +45,7 @@ public class OSSFileController {
45 45  
46 46 @ResponseBody
47 47 @PostMapping("/upload")
48   - @RequiresRoles("admin")
  48 + //@RequiresRoles({"admin"})
49 49 public Result upload(@RequestParam("file") MultipartFile multipartFile) {
50 50 Result result = new Result();
51 51 try {
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
  View file @aa65d6a
... ... @@ -86,7 +86,7 @@ public class QuartzJobController {
86 86 * @param quartzJob
87 87 * @return
88 88 */
89   - @RequiresRoles("admin")
  89 + //@RequiresRoles({"admin"})
90 90 @RequestMapping(value = "/add", method = RequestMethod.POST)
91 91 public Result<?> add(@RequestBody QuartzJob quartzJob) {
92 92 List<QuartzJob> list = quartzJobService.findByJobClassName(quartzJob.getJobClassName());
... ... @@ -103,7 +103,7 @@ public class QuartzJobController {
103 103 * @param quartzJob
104 104 * @return
105 105 */
106   - @RequiresRoles("admin")
  106 + //@RequiresRoles({"admin"})
107 107 @RequestMapping(value = "/edit", method = RequestMethod.PUT)
108 108 public Result<?> eidt(@RequestBody QuartzJob quartzJob) {
109 109 try {
... ... @@ -121,7 +121,7 @@ public class QuartzJobController {
121 121 * @param id
122 122 * @return
123 123 */
124   - @RequiresRoles("admin")
  124 + //@RequiresRoles({"admin"})
125 125 @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
126 126 public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
127 127 QuartzJob quartzJob = quartzJobService.getById(id);
... ... @@ -139,7 +139,7 @@ public class QuartzJobController {
139 139 * @param ids
140 140 * @return
141 141 */
142   - @RequiresRoles("admin")
  142 + //@RequiresRoles({"admin"})
143 143 @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
144 144 public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
145 145 if (ids == null || "".equals(ids.trim())) {
... ... @@ -158,7 +158,7 @@ public class QuartzJobController {
158 158 * @param jobClassName
159 159 * @return
160 160 */
161   - @RequiresRoles("admin")
  161 + //@RequiresRoles({"admin"})
162 162 @GetMapping(value = "/pause")
163 163 @ApiOperation(value = "暂停定时任务")
164 164 public Result<Object> pauseJob(@RequestParam(name = "jobClassName", required = true) String jobClassName) {
... ... @@ -183,7 +183,7 @@ public class QuartzJobController {
183 183 * @param jobClassName
184 184 * @return
185 185 */
186   - @RequiresRoles("admin")
  186 + //@RequiresRoles({"admin"})
187 187 @GetMapping(value = "/resume")
188 188 @ApiOperation(value = "恢复定时任务")
189 189 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
  View file @aa65d6a
... ... @@ -63,7 +63,7 @@ public class TestWebController {
63 63 }
64 64  
65 65 @GetMapping("/require_role")
66   - @RequiresRoles("admin")
  66 + @RequiresRoles({"admin"})
67 67 public ResponseBean requireRole() {
68 68 return new ResponseBean(200, "You are visiting require_role", null);
69 69 }
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
  View file @aa65d6a
... ... @@ -246,7 +246,7 @@ public class SysPermissionController {
246 246 * @param permission
247 247 * @return
248 248 */
249   - @RequiresRoles({ "admin" })
  249 + //@RequiresRoles({"admin"})
250 250 @RequestMapping(value = "/add", method = RequestMethod.POST)
251 251 public Result<SysPermission> add(@RequestBody SysPermission permission) {
252 252 Result<SysPermission> result = new Result<SysPermission>();
... ... @@ -266,7 +266,7 @@ public class SysPermissionController {
266 266 * @param permission
267 267 * @return
268 268 */
269   - @RequiresRoles({ "admin" })
  269 + //@RequiresRoles({"admin"})
270 270 @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
271 271 public Result<SysPermission> edit(@RequestBody SysPermission permission) {
272 272 Result<SysPermission> result = new Result<>();
... ... @@ -286,7 +286,7 @@ public class SysPermissionController {
286 286 * @param id
287 287 * @return
288 288 */
289   - @RequiresRoles({ "admin" })
  289 + //@RequiresRoles({"admin"})
290 290 @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
291 291 public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
292 292 Result<SysPermission> result = new Result<>();
... ... @@ -305,7 +305,7 @@ public class SysPermissionController {
305 305 * @param ids
306 306 * @return
307 307 */
308   - @RequiresRoles({ "admin" })
  308 + //@RequiresRoles({"admin"})
309 309 @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
310 310 public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
311 311 Result<SysPermission> result = new Result<>();
... ... @@ -403,7 +403,7 @@ public class SysPermissionController {
403 403 * @return
404 404 */
405 405 @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST)
406   - @RequiresRoles({ "admin" })
  406 + //@RequiresRoles({"admin"})
407 407 public Result<String> saveRolePermission(@RequestBody JSONObject json) {
408 408 long start = System.currentTimeMillis();
409 409 Result<String> result = new Result<>();
... ... @@ -773,7 +773,7 @@ public class SysPermissionController {
773 773 * @return
774 774 */
775 775 @RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST)
776   - @RequiresRoles({ "admin" })
  776 + //@RequiresRoles({"admin"})
777 777 public Result<String> saveDepartPermission(@RequestBody JSONObject json) {
778 778 long start = System.currentTimeMillis();
779 779 Result<String> result = new Result<>();
... ...
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  View file @aa65d6a
... ... @@ -130,7 +130,7 @@ public class SysUserController {
130 130 }
131 131  
132 132 @RequestMapping(value = "/add", method = RequestMethod.POST)
133   - @RequiresPermissions("user:add")
  133 + //@RequiresPermissions("user:add")
134 134 public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
135 135 Result<SysUser> result = new Result<SysUser>();
136 136 String selectedRoles = jsonObject.getString("selectedroles");
... ... @@ -426,7 +426,7 @@ public class SysUserController {
426 426 * @param response
427 427 * @return
428 428 */
429   - @RequiresPermissions("user:import")
  429 + //@RequiresPermissions("user:import")
430 430 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
431 431 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
432 432 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
... ...