From ef03d1c80b328d224029368d8dd9f0b1e85e9bbc Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Mon, 4 Nov 2019 13:55:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/config/ElPermissionConfig.java | 3 +-- .../security/rest/AuthenticationController.java | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) 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("密码错误"); } From 5fde06bb55783d36aaad85b81857d73b46efb492 Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Mon, 4 Nov 2019 14:06:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?2.3=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/zhengjie/config/ConfigurerAdapter.java | 1 + .../me/zhengjie/modules/security/config/SecurityConfig.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java index ef835c6a..eddc9e38 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java @@ -6,6 +6,7 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.nio.file.Paths; /** * WebMvcConfigurer diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java index 19a7efe5..786fca90 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SecurityConfig.java @@ -88,7 +88,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { HandlerMethod handlerMethod = infoEntry.getValue(); AnonymousAccess anonymousAccess = handlerMethod.getMethodAnnotation(AnonymousAccess.class); PreAuthorize preAuthorize = handlerMethod.getMethodAnnotation(PreAuthorize.class); - if (null != preAuthorize && preAuthorize.value().contains("anonymous")) { + if (null != preAuthorize && preAuthorize.value().toLowerCase().contains("anonymous")) { anonymousUrls.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); } else if (null != anonymousAccess && null == preAuthorize) { anonymousUrls.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); From 2e61bbc97719c71dbca08c3ae8175f398b316c5f Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Mon, 4 Nov 2019 15:47:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0sql=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/eladmin.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/eladmin.sql b/sql/eladmin.sql index 2512de53..e8deaf44 100644 --- a/sql/eladmin.sql +++ b/sql/eladmin.sql @@ -1,4 +1,4 @@ -* +/* Navicat Premium Data Transfer Source Server : 本地 From a3fcb363ec8d8a9372b4866497e850376196b292 Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Tue, 5 Nov 2019 08:57:16 +0800 Subject: [PATCH 4/4] update --- git | 0 master) | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 git delete mode 100644 master) diff --git a/git b/git deleted file mode 100644 index e69de29b..00000000 diff --git a/master) b/master) deleted file mode 100644 index e69de29b..00000000