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 73f51d35..33ee85bb 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; import java.nio.file.Paths; 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("密码错误"); } 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 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 : 本地