diff --git a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java index 99e345c9..d7f6aa7e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java +++ b/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java @@ -19,7 +19,6 @@ public class ElPermissionConfig { // 获取当前用户的所有权限 List elPermissions = SecurityUtils.getUserDetails().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()); // 判断当前用户的所有权限是否包含接口上定义的权限 - List list = Arrays.stream(permissions).filter(elPermissions::contains).collect(Collectors.toList()); - return elPermissions.contains("admin") || list.size() != 0; + return elPermissions.contains("admin") || Arrays.stream(permissions).anyMatch(elPermissions::contains); } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java index c6be8204..916453cb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthenticationController.java @@ -61,21 +61,21 @@ public class AuthenticationController { @ApiOperation("登录授权") @AnonymousAccess @PostMapping(value = "/login") - public ResponseEntity login(@Validated @RequestBody AuthUser authorizationUser, HttpServletRequest request){ + public ResponseEntity login(@Validated @RequestBody AuthUser authUser, HttpServletRequest request){ // 查询验证码 - String code = redisService.getCodeVal(authorizationUser.getUuid()); + String code = redisService.getCodeVal(authUser.getUuid()); // 清除验证码 - redisService.delete(authorizationUser.getUuid()); + redisService.delete(authUser.getUuid()); if (StringUtils.isBlank(code)) { throw new BadRequestException("验证码已过期"); } - if (StringUtils.isBlank(authorizationUser.getCode()) || !authorizationUser.getCode().equalsIgnoreCase(code)) { + if (StringUtils.isBlank(authUser.getCode()) || !authUser.getCode().equalsIgnoreCase(code)) { throw new BadRequestException("验证码错误"); } - final JwtUser jwtUser = (JwtUser) userDetailsService.loadUserByUsername(authorizationUser.getUsername()); + final JwtUser jwtUser = (JwtUser) userDetailsService.loadUserByUsername(authUser.getUsername()); - if(!jwtUser.getPassword().equals(EncryptUtils.encryptPassword(authorizationUser.getPassword()))){ + if(!jwtUser.getPassword().equals(EncryptUtils.encryptPassword(authUser.getPassword()))){ throw new AccountExpiredException("密码错误"); }