更换图形验证码工具，其他细节优化

AprilVii · Jun 20, 2019 · 375cdf4 · 375cdf4
1 parent 525c356
commit 375cdf4
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 33 deletions.
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java
@@ -81,9 +81,6 @@ public ResponseEntity create(@Validated @RequestBody Menu resources){
     @PutMapping(value = "/menus")
     @PreAuthorize("hasAnyRole('ADMIN','MENU_ALL','MENU_EDIT')")
     public ResponseEntity update(@Validated(Menu.Update.class) @RequestBody Menu resources){
-        if (resources.getId() <= new Long(39).longValue()) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         menuService.update(resources);
         return new ResponseEntity(HttpStatus.NO_CONTENT);
     }
@@ -92,9 +89,6 @@ public ResponseEntity update(@Validated(Menu.Update.class) @RequestBody Menu res
     @DeleteMapping(value = "/menus/{id}")
     @PreAuthorize("hasAnyRole('ADMIN','MENU_ALL','MENU_DELETE')")
     public ResponseEntity delete(@PathVariable Long id){
-        if (id.longValue() <= new Long(39).longValue()) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         List<Menu> menuList = menuService.findByPid(id);
 
         // 特殊情况，对级联删除进行处理

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/PermissionController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/PermissionController.java
@@ -60,9 +60,6 @@ public ResponseEntity create(@Validated @RequestBody Permission resources){
     @PutMapping(value = "/permissions")
     @PreAuthorize("hasAnyRole('ADMIN','PERMISSION_ALL','PERMISSION_EDIT')")
     public ResponseEntity update(@Validated(Permission.Update.class) @RequestBody Permission resources){
-        if (resources.getId() <= new Long(54).longValue()) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         permissionService.update(resources);
         return new ResponseEntity(HttpStatus.NO_CONTENT);
     }
@@ -71,9 +68,6 @@ public ResponseEntity update(@Validated(Permission.Update.class) @RequestBody Pe
     @DeleteMapping(value = "/permissions/{id}")
     @PreAuthorize("hasAnyRole('ADMIN','PERMISSION_ALL','PERMISSION_DELETE')")
     public ResponseEntity delete(@PathVariable Long id){
-        if (id <= new Long(54).longValue()) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         permissionService.delete(id);
         return new ResponseEntity(HttpStatus.OK);
     }

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java
@@ -82,9 +82,6 @@ public ResponseEntity create(@Validated @RequestBody Role resources){
     @PutMapping(value = "/roles")
     @PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_EDIT')")
     public ResponseEntity update(@Validated(Role.Update.class) @RequestBody Role resources){
-        if (resources.getId().equals(1L)) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         roleService.update(resources);
         return new ResponseEntity(HttpStatus.NO_CONTENT);
     }
@@ -93,9 +90,6 @@ public ResponseEntity update(@Validated(Role.Update.class) @RequestBody Role res
     @PutMapping(value = "/roles/permission")
     @PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_EDIT')")
     public ResponseEntity updatePermission(@RequestBody Role resources){
-        if (resources.getId().equals(1L)) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         roleService.updatePermission(resources,roleService.findById(resources.getId()));
         return new ResponseEntity(HttpStatus.NO_CONTENT);
     }
@@ -104,9 +98,6 @@ public ResponseEntity updatePermission(@RequestBody Role resources){
     @PutMapping(value = "/roles/menu")
     @PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_EDIT')")
     public ResponseEntity updateMenu(@RequestBody Role resources){
-        if (resources.getId().equals(1L)) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         roleService.updateMenu(resources,roleService.findById(resources.getId()));
         return new ResponseEntity(HttpStatus.NO_CONTENT);
     }
@@ -115,9 +106,6 @@ public ResponseEntity updateMenu(@RequestBody Role resources){
     @DeleteMapping(value = "/roles/{id}")
     @PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_DELETE')")
     public ResponseEntity delete(@PathVariable Long id){
-        if (id.equals(1L)) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         roleService.delete(id);
         return new ResponseEntity(HttpStatus.OK);
     }

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
@@ -102,9 +102,6 @@ public ResponseEntity create(@Validated @RequestBody User resources){
     @PutMapping(value = "/users")
     @PreAuthorize("hasAnyRole('ADMIN','USER_ALL','USER_EDIT')")
     public ResponseEntity update(@Validated(User.Update.class) @RequestBody User resources){
-        if (resources.getId().equals(1L)) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         checkLevel(resources);
         userService.update(resources);
         return new ResponseEntity(HttpStatus.NO_CONTENT);
@@ -114,9 +111,6 @@ public ResponseEntity update(@Validated(User.Update.class) @RequestBody User res
     @DeleteMapping(value = "/users/{id}")
     @PreAuthorize("hasAnyRole('ADMIN','USER_ALL','USER_DELETE')")
     public ResponseEntity delete(@PathVariable Long id){
-        if (id.equals(1L)) {
-            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()));
 
@@ -151,9 +145,6 @@ public ResponseEntity validPass(@RequestBody User user){
     @PostMapping(value = "/users/updatePass")
     public ResponseEntity updatePass(@RequestBody User user){
         UserDetails userDetails = SecurityUtils.getUserDetails();
-        if (userDetails.getUsername().equals("admin")) {
-            throw new BadRequestException("演示环境不可操作");
-        }
         if(userDetails.getPassword().equals(EncryptUtils.encryptPassword(user.getPassword()))){
             throw new BadRequestException("新密码不能与旧密码相同");
         }