From 7fb6f3601677a99e04fb163820f78869a01059af Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 3 Dec 2019 10:12:58 +0800 Subject: [PATCH] =?UTF-8?q?delete=20=E6=BC=94=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/yixiang/mp/controller/YxArticleController.java | 4 ++-- .../co/yixiang/mp/controller/YxCacheController.java | 2 +- .../yixiang/mp/controller/YxWechatReplyController.java | 2 +- .../activity/rest/YxStoreCombinationController.java | 6 +++--- .../yixiang/modules/monitor/rest/RedisController.java | 5 +++++ .../modules/quartz/rest/QuartzJobController.java | 10 +++++----- .../modules/shop/rest/YxStoreCategoryController.java | 6 +++--- .../modules/shop/rest/YxStoreProductController.java | 6 +++--- .../modules/shop/rest/YxSystemGroupDataController.java | 6 +++--- .../co/yixiang/modules/system/rest/MenuController.java | 6 +++--- .../modules/system/rest/PermissionController.java | 4 ++-- .../co/yixiang/modules/system/rest/RoleController.java | 6 +++--- .../co/yixiang/modules/system/rest/UserController.java | 6 +++--- .../modules/wechat/rest/YxSystemConfigController.java | 2 +- .../src/main/java/co/yixiang/rest/QiniuController.java | 10 +++++----- 15 files changed, 43 insertions(+), 38 deletions(-) diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java index cd1cadf7..6a9485f5 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java @@ -60,7 +60,7 @@ public class YxArticleController { @DeleteMapping(value = "/yxArticle/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXARTICLE_ALL','YXARTICLE_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); yxArticleService.delete(id); return new ResponseEntity(HttpStatus.OK); } @@ -69,7 +69,7 @@ public class YxArticleController { @GetMapping(value = "/yxArticle/publish/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXARTICLE_ALL','YXARTICLE_DELETE')") public ResponseEntity publish(@PathVariable Integer id) throws Exception{ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); YxArticleDTO yxArticleDTO= yxArticleService.findById(id); yxArticleService.uploadNews(yxArticleDTO); return new ResponseEntity(HttpStatus.OK); diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java index 9e4c4a98..392e8430 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java @@ -47,7 +47,7 @@ public class YxCacheController { @PostMapping(value = "/yxCache") @PreAuthorize("hasAnyRole('ADMIN','YXCACHE_ALL','YXCACHE_CREATE')") public ResponseEntity create( @RequestBody String jsonStr){ - if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); + //if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); JSONObject jsonObject = JSON.parseObject(jsonStr); String jsonButton = jsonObject.get("buttons").toString(); YxCache yxCache = new YxCache(); diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java index ee8063bc..12c460a6 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java @@ -41,7 +41,7 @@ public class YxWechatReplyController { @PostMapping(value = "/yxWechatReply") @PreAuthorize("hasAnyRole('ADMIN','YXWECHATREPLY_ALL','YXWECHATREPLY_CREATE')") public ResponseEntity create(@RequestBody String jsonStr){ - if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); + //if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); JSONObject jsonObject = JSON.parseObject(jsonStr); YxWechatReply yxWechatReply = new YxWechatReply(); YxWechatReply isExist = yxWechatReplyService.isExist(jsonObject.get("key").toString()); diff --git a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java b/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java index 92f84fb5..3bf88fd1 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java @@ -45,7 +45,7 @@ public class YxStoreCombinationController { @PutMapping(value = "/yxStoreCombination") @PreAuthorize("hasAnyRole('ADMIN','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreCombination resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); if(ObjectUtil.isNotNull(resources.getStartTimeDate())){ resources.setStartTime(OrderUtil. dateToTimestamp(resources.getStartTimeDate())); @@ -67,7 +67,7 @@ public class YxStoreCombinationController { @ApiOperation(value = "开启关闭") @PostMapping(value = "/yxStoreCombination/onsale/{id}") public ResponseEntity onSale(@PathVariable Integer id,@RequestBody String jsonStr){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); JSONObject jsonObject = JSON.parseObject(jsonStr); int status = Integer.valueOf(jsonObject.get("status").toString()); //System.out.println(status); @@ -80,7 +80,7 @@ public class YxStoreCombinationController { @DeleteMapping(value = "/yxStoreCombination/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); YxStoreCombination combination = new YxStoreCombination(); combination.setIsDel(1); yxStoreCombinationService.update(combination); diff --git a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java index bb892ed2..1c04352f 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java @@ -1,5 +1,8 @@ package co.yixiang.modules.monitor.rest; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import co.yixiang.exception.BadRequestException; import co.yixiang.modules.monitor.service.RedisService; import co.yixiang.aop.log.Log; import co.yixiang.modules.monitor.domain.vo.RedisVo; @@ -32,6 +35,7 @@ public class RedisController { @DeleteMapping(value = "/redis") @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_DELETE')") public ResponseEntity delete(@RequestBody RedisVo resources){ + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); redisService.delete(resources.getKey()); return new ResponseEntity(HttpStatus.OK); } @@ -40,6 +44,7 @@ public class RedisController { @DeleteMapping(value = "/redis/all") @PreAuthorize("hasAnyRole('ADMIN','REDIS_ALL','REDIS_DELETE')") public ResponseEntity deleteAll(){ + //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); redisService.flushdb(); return new ResponseEntity(HttpStatus.OK); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java b/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java index 25e81c58..d78ecec1 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java @@ -46,7 +46,7 @@ public class QuartzJobController { @PostMapping(value = "/jobs") @PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_CREATE')") public ResponseEntity create(@Validated @RequestBody QuartzJob resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); if (resources.getId() != null) { throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID"); } @@ -57,7 +57,7 @@ public class QuartzJobController { @PutMapping(value = "/jobs") @PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_EDIT')") public ResponseEntity update(@Validated(QuartzJob.Update.class) @RequestBody QuartzJob resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); quartzJobService.update(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -66,7 +66,7 @@ public class QuartzJobController { @PutMapping(value = "/jobs/{id}") @PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_EDIT')") public ResponseEntity updateIsPause(@PathVariable Long id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); quartzJobService.updateIsPause(quartzJobService.findById(id)); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -75,7 +75,7 @@ public class QuartzJobController { @PutMapping(value = "/jobs/exec/{id}") @PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_EDIT')") public ResponseEntity execution(@PathVariable Long id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); quartzJobService.execution(quartzJobService.findById(id)); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -84,7 +84,7 @@ public class QuartzJobController { @DeleteMapping(value = "/jobs/{id}") @PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_DELETE')") public ResponseEntity delete(@PathVariable Long id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); quartzJobService.delete(quartzJobService.findById(id)); return new ResponseEntity(HttpStatus.OK); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java b/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java index 75627d19..be649831 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreCategoryController.java @@ -47,7 +47,7 @@ public class YxStoreCategoryController { @PostMapping(value = "/yxStoreCategory") @PreAuthorize("hasAnyRole('ADMIN','YXSTORECATEGORY_ALL','YXSTORECATEGORY_CREATE')") public ResponseEntity create(@Validated @RequestBody YxStoreCategory resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); resources.setAddTime(OrderUtil.getSecondTimestampTwo()); return new ResponseEntity(yxStoreCategoryService.create(resources),HttpStatus.CREATED); } @@ -57,7 +57,7 @@ public class YxStoreCategoryController { @PutMapping(value = "/yxStoreCategory") @PreAuthorize("hasAnyRole('ADMIN','YXSTORECATEGORY_ALL','YXSTORECATEGORY_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreCategory resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); yxStoreCategoryService.update(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -67,7 +67,7 @@ public class YxStoreCategoryController { @DeleteMapping(value = "/yxStoreCategory/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXSTORECATEGORY_ALL','YXSTORECATEGORY_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); yxStoreCategoryService.delete(id); return new ResponseEntity(HttpStatus.OK); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java b/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java index 23b6baa6..524baa5e 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductController.java @@ -46,7 +46,7 @@ public class YxStoreProductController { @PostMapping(value = "/yxStoreProduct") @PreAuthorize("hasAnyRole('ADMIN','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_CREATE')") public ResponseEntity create(@Validated @RequestBody YxStoreProduct resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); resources.setAddTime(OrderUtil.getSecondTimestampTwo()); if(ObjectUtil.isEmpty(resources.getGiveIntegral())) resources.setGiveIntegral(BigDecimal.ZERO); if(ObjectUtil.isEmpty(resources.getCost())) resources.setCost(BigDecimal.ZERO); @@ -58,7 +58,7 @@ public class YxStoreProductController { @PutMapping(value = "/yxStoreProduct") @PreAuthorize("hasAnyRole('ADMIN','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreProduct resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); yxStoreProductService.update(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -68,7 +68,7 @@ public class YxStoreProductController { @DeleteMapping(value = "/yxStoreProduct/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); yxStoreProductService.delete(id); return new ResponseEntity(HttpStatus.OK); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java b/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java index 85fb616b..36c5a27f 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/shop/rest/YxSystemGroupDataController.java @@ -45,7 +45,7 @@ public class YxSystemGroupDataController { @PostMapping(value = "/yxSystemGroupData") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_CREATE')") public ResponseEntity create(@RequestBody String jsonStr){ - if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); + //if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); JSONObject jsonObject = JSON.parseObject(jsonStr); if(ObjectUtil.isNotNull(jsonObject.get("name"))){ @@ -88,7 +88,7 @@ public class YxSystemGroupDataController { @PutMapping(value = "/yxSystemGroupData") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT')") public ResponseEntity update(@RequestBody String jsonStr){ - if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); + //if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); JSONObject jsonObject = JSON.parseObject(jsonStr); if(ObjectUtil.isNotNull(jsonObject.get("name"))){ if(StrUtil.isEmpty(jsonObject.get("name").toString())){ @@ -123,7 +123,7 @@ public class YxSystemGroupDataController { @DeleteMapping(value = "/yxSystemGroupData/{id}") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); yxSystemGroupDataService.delete(id); return new ResponseEntity(HttpStatus.OK); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java index dcb5a12d..822803ec 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java @@ -74,7 +74,7 @@ public class MenuController { @PostMapping(value = "/menus") @PreAuthorize("hasAnyRole('ADMIN','MENU_ALL','MENU_CREATE')") public ResponseEntity create(@Validated @RequestBody Menu resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); if (resources.getId() != null) { throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID"); } @@ -85,7 +85,7 @@ public class MenuController { @PutMapping(value = "/menus") @PreAuthorize("hasAnyRole('ADMIN','MENU_ALL','MENU_EDIT')") public ResponseEntity update(@Validated(Menu.Update.class) @RequestBody Menu resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); menuService.update(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -94,7 +94,7 @@ public class MenuController { @DeleteMapping(value = "/menus/{id}") @PreAuthorize("hasAnyRole('ADMIN','MENU_ALL','MENU_DELETE')") public ResponseEntity delete(@PathVariable Long id){ - if(id>0) throw new BadRequestException("演示环境禁止操作"); + //if(id>0) throw new BadRequestException("演示环境禁止操作"); List menuList = menuService.findByPid(id); Set menuSet = new HashSet<>(); menuSet.add(menuService.findOne(id)); diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/PermissionController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/PermissionController.java index 8d818d62..28109d16 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/PermissionController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/PermissionController.java @@ -67,7 +67,7 @@ public class PermissionController { @PutMapping(value = "/permissions") @PreAuthorize("hasAnyRole('ADMIN','PERMISSION_ALL','PERMISSION_EDIT')") public ResponseEntity update(@Validated(Permission.Update.class) @RequestBody Permission resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); permissionService.update(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -76,7 +76,7 @@ public class PermissionController { @DeleteMapping(value = "/permissions/{id}") @PreAuthorize("hasAnyRole('ADMIN','PERMISSION_ALL','PERMISSION_DELETE')") public ResponseEntity delete(@PathVariable Long id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); List permissions = permissionService.findByPid(id); Set permissionSet = new HashSet<>(); permissionSet.add(permissionMapper.toEntity(permissionService.findById(id))); diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java index d4147dc8..ffbfdea1 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/RoleController.java @@ -84,7 +84,7 @@ public class RoleController { @PutMapping(value = "/roles") @PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_EDIT')") public ResponseEntity update(@Validated(Role.Update.class) @RequestBody Role resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); roleService.update(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -93,7 +93,7 @@ public class RoleController { @PutMapping(value = "/roles/permission") @PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_EDIT')") public ResponseEntity updatePermission(@RequestBody Role resources){ - if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作"); roleService.updatePermission(resources,roleService.findById(resources.getId())); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -111,7 +111,7 @@ public class RoleController { @DeleteMapping(value = "/roles/{id}") @PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_DELETE')") public ResponseEntity delete(@PathVariable Long id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); try { roleService.delete(id); }catch (Throwable e){ diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java index c8fb2d20..a9b11ae1 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java @@ -125,7 +125,7 @@ public class UserController { @DeleteMapping(value = "/users/{id}") @PreAuthorize("hasAnyRole('ADMIN','USER_ALL','USER_DELETE')") public ResponseEntity delete(@PathVariable Long id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); Integer currentLevel = Collections.min(roleService.findByUsers_Id(SecurityUtils.getUserId()).stream().map(RoleSmallDTO::getLevel).collect(Collectors.toList())); Integer optLevel = Collections.min(roleService.findByUsers_Id(id).stream().map(RoleSmallDTO::getLevel).collect(Collectors.toList())); @@ -143,7 +143,7 @@ public class UserController { */ @PostMapping(value = "/users/updatePass") public ResponseEntity updatePass(@RequestBody UserPassVo user){ - if(ObjectUtil.isNotNull(user)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(user)) throw new BadRequestException("演示环境禁止操作"); UserDetails userDetails = SecurityUtils.getUserDetails(); if(!userDetails.getPassword().equals(EncryptUtils.encryptPassword(user.getOldPass()))){ throw new BadRequestException("修改失败，旧密码错误"); @@ -162,7 +162,7 @@ public class UserController { */ @PostMapping(value = "/users/updateAvatar") public ResponseEntity updateAvatar(@RequestParam MultipartFile file){ - if(ObjectUtil.isNotNull(file)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(file)) throw new BadRequestException("演示环境禁止操作"); userService.updateAvatar(file); return new ResponseEntity(HttpStatus.OK); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java b/yshop-system/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java index bd8b0d0e..bef6f0f3 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java @@ -44,7 +44,7 @@ public class YxSystemConfigController { @PostMapping(value = "/yxSystemConfig") @PreAuthorize("hasAnyRole('ADMIN','YXSYSTEMCONFIG_ALL','YXSYSTEMCONFIG_CREATE')") public ResponseEntity create(@RequestBody String jsonStr){ - if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); + //if(StrUtil.isNotEmpty(jsonStr)) throw new BadRequestException("演示环境禁止操作"); JSONObject jsonObject = JSON.parseObject(jsonStr); jsonObject.forEach( (key,value)->{ diff --git a/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java b/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java index b49969cb..f5f7a481 100644 --- a/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java +++ b/yshop-tools/src/main/java/co/yixiang/rest/QiniuController.java @@ -40,7 +40,7 @@ public class QiniuController { @Log("配置七牛云存储") @PutMapping(value = "/qiNiuConfig") public ResponseEntity emailConfig(@Validated @RequestBody QiniuConfig qiniuConfig){ - if(ObjectUtil.isNotNull(qiniuConfig)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(qiniuConfig)) throw new BadRequestException("演示环境禁止操作"); qiNiuService.update(qiniuConfig); qiNiuService.update(qiniuConfig.getType()); return new ResponseEntity(HttpStatus.OK); @@ -60,7 +60,7 @@ public class QiniuController { @Log("上传文件") @PostMapping(value = "/qiNiuContent") public ResponseEntity upload(@RequestParam MultipartFile file){ - if(ObjectUtil.isNotNull(file)) throw new BadRequestException("演示环境禁止操作"); + //if(ObjectUtil.isNotNull(file)) throw new BadRequestException("演示环境禁止操作"); QiniuContent qiniuContent = qiNiuService.upload(file,qiNiuService.find()); Map map = new HashMap(3); map.put("id",qiniuContent.getId()); @@ -90,7 +90,7 @@ public class QiniuController { @Log("下载文件") @GetMapping(value = "/qiNiuContent/download/{id}") public ResponseEntity download(@PathVariable Long id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); Map map = new HashMap(1); map.put("url", qiNiuService.download(qiNiuService.findByContentId(id),qiNiuService.find())); return new ResponseEntity(map,HttpStatus.OK); @@ -105,7 +105,7 @@ public class QiniuController { @Log("删除文件") @DeleteMapping(value = "/qiNiuContent/{id}") public ResponseEntity delete(@PathVariable Long id){ - if(id > 0) throw new BadRequestException("演示环境禁止操作"); + //if(id > 0) throw new BadRequestException("演示环境禁止操作"); qiNiuService.delete(qiNiuService.findByContentId(id),qiNiuService.find()); return new ResponseEntity(HttpStatus.OK); } @@ -118,7 +118,7 @@ public class QiniuController { @Log("删除图片") @DeleteMapping(value = "/qiNiuContent") public ResponseEntity deleteAll(@RequestBody Long[] ids) { - if(ArrayUtil.isNotEmpty(ids)) throw new BadRequestException("演示环境禁止操作"); + // if(ArrayUtil.isNotEmpty(ids)) throw new BadRequestException("演示环境禁止操作"); qiNiuService.deleteAll(ids, qiNiuService.find()); return new ResponseEntity(HttpStatus.OK); }