wms / wms4_globaltaiguogeli · Commits

Commit aa65d6a45f48e1c6fc90ccea7b46fe30caee7118

Authored by zhangdaiscott
1 parent 98700817

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