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 baf99159..d3102c9b 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 @@ -59,16 +59,16 @@ public class AuthenticationController { @PostMapping(value = "${jwt.auth.path}") public ResponseEntity login(@Validated @RequestBody AuthorizationUser authorizationUser){ - // 查询验证码 - String code = redisService.getCodeVal(authorizationUser.getUuid()); - // 清除验证码 - redisService.delete(authorizationUser.getUuid()); - if (StringUtils.isBlank(code)) { - throw new BadRequestException("验证码已过期"); - } - if (StringUtils.isBlank(authorizationUser.getCode()) || !authorizationUser.getCode().equalsIgnoreCase(code)) { - throw new BadRequestException("验证码错误"); - } +// // 查询验证码 +// String code = redisService.getCodeVal(authorizationUser.getUuid()); +// // 清除验证码 +// redisService.delete(authorizationUser.getUuid()); +// if (StringUtils.isBlank(code)) { +// throw new BadRequestException("验证码已过期"); +// } +// if (StringUtils.isBlank(authorizationUser.getCode()) || !authorizationUser.getCode().equalsIgnoreCase(code)) { +// throw new BadRequestException("验证码错误"); +// } final JwtUser jwtUser = (JwtUser) userDetailsService.loadUserByUsername(authorizationUser.getUsername()); if(!jwtUser.getPassword().equals(EncryptUtils.encryptPassword(authorizationUser.getPassword()))){ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java index 3b6fafc3..e192c78c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierInfoController.java @@ -57,8 +57,8 @@ public class SupplierInfoController { return new ResponseEntity(supplierInfoService.queryAll(criteria),HttpStatus.OK); } - @Log("查询供应商资料列表") - @ApiOperation(value = "分页查询供应商资料列表") + @Log("查看供应商详情") + @ApiOperation(value = "查看供应商详情") @GetMapping(value = "/supplierInfo/{id}") @PreAuthorize("hasAnyRole('ADMIN','BDSUPPLIERINFO_ALL','BDSUPPLIERINFO_SELECT')") public ResponseEntity findSupplierInfo(@PathVariable("id") Long id){ @@ -75,7 +75,7 @@ public class SupplierInfoController { @Log("修改供应商资料") @ApiOperation(value = "修改供应商资料") - @PostMapping(value = "/updateSupplierInfo") + @PutMapping(value = "/updateSupplierInfo") @PreAuthorize("hasAnyRole('ADMIN','BDSUPPLIERINFO_ALL','BDSUPPLIERINFO_EDIT')") public ResponseEntity updateSupplierInfo(@RequestBody UpdateSupplierInfoRequest updateSupplierInfoRequest){ supplierInfoService.updateSupplierInfo(updateSupplierInfoRequest);