From 5b5e494524fbf8869756f30c1450ff2104779c47 Mon Sep 17 00:00:00 2001
From: starrysky <838252223@qq.com>
Date: Mon, 19 Aug 2019 19:33:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=88=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E9=AA=8C=E8=AF=81=E7=A0=81=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rest/AuthenticationController.java        | 20 +++++++++----------
 .../wms/bd/rest/SupplierInfoController.java   |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

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);