优化修改密码不能修改的bug

lmxdawn · lmxdawn · commit ce7c1af8bbea · 2018-11-19T20:23:50.000+08:00
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/controller/admin/auth/LoginController.java b/admin-api/src/main/java/com/lmxdawn/admin/controller/admin/auth/LoginController.java
@@ -1,12 +1,9 @@
 package com.lmxdawn.admin.controller.admin.auth;
 
 import com.lmxdawn.admin.annotation.AdminAuthRuleAnnotation;
-import com.lmxdawn.admin.entity.AuthAdmin;
 import com.lmxdawn.admin.enums.ResultEnum;
-import com.lmxdawn.admin.exception.JsonException;
 import com.lmxdawn.admin.form.admin.LoginForm;
 import com.lmxdawn.admin.form.admin.UpdatePasswordForm;
-import com.lmxdawn.admin.service.admin.AuthAdminService;
 import com.lmxdawn.admin.service.admin.AuthLoginService;
 import com.lmxdawn.admin.utils.ResultVOUtil;
 import com.lmxdawn.admin.vo.ResultVO;
@@ -74,9 +71,9 @@ public ResultVO out(){
      */
     @AdminAuthRuleAnnotation("")
     @PostMapping("/admin/auth/login/password")
-    public ResultVO password(@Valid UpdatePasswordForm updatePasswordForm,
+    public ResultVO password(@RequestBody @Valid UpdatePasswordForm updatePasswordForm,
                              BindingResult bindingResult) {
-
+        System.out.println(updatePasswordForm);
         if (bindingResult.hasErrors()) {
             return ResultVOUtil.error(ResultEnum.PARAM_VERIFY_FALL.getCode(),
                     bindingResult.getFieldError().getDefaultMessage());
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/form/admin/UpdatePasswordForm.java b/admin-api/src/main/java/com/lmxdawn/admin/form/admin/UpdatePasswordForm.java
@@ -3,14 +3,15 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * 修改密码的表单
  */
 @Data
 public class UpdatePasswordForm {
 
-    @NotEmpty(message = "参数错误！")
+    @NotNull(message = "参数错误！")
     private Long adminId;
 
     @NotEmpty(message = "请输入旧密码")
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/handler/GlobalExceptionHandler.java b/admin-api/src/main/java/com/lmxdawn/admin/handler/GlobalExceptionHandler.java
@@ -4,13 +4,15 @@
 import com.lmxdawn.admin.exception.JsonException;
 import com.lmxdawn.admin.utils.ResultVOUtil;
 import com.lmxdawn.admin.vo.ResultVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 /**
  * 错误回调
  */
 @RestControllerAdvice
+@Slf4j
 public class GlobalExceptionHandler {
     
     // 拦截API异常
@@ -23,6 +25,7 @@ public ResultVO handlerJsonException(JsonException e) {
     // 拦截API异常
     @ExceptionHandler(value = RuntimeException.class)
     public ResultVO handlerRuntimeException(RuntimeException e) {
+        log.error(e.getMessage());
         // 返回对应的错误信息
         return ResultVOUtil.error(ResultEnum.NOT_NETWORK);
     }
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/service/admin/impl/AuthAdminServiceImpl.java b/admin-api/src/main/java/com/lmxdawn/admin/service/admin/impl/AuthAdminServiceImpl.java
@@ -54,7 +54,7 @@ public AuthAdmin findById(Long id) {
      */
     @Override
     public AuthAdmin findPwdById(Long id) {
-        return authAdminDao.findById(id);
+        return authAdminDao.findPwdById(id);
     }
 
     @Override
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/service/admin/impl/AuthLoginServiceImpl.java b/admin-api/src/main/java/com/lmxdawn/admin/service/admin/impl/AuthLoginServiceImpl.java
@@ -120,13 +120,16 @@ public boolean updatePassword(UpdatePasswordForm updatePasswordForm) {
         if (authAdmin == null) {
             throw new JsonException(ResultEnum.DATA_NOT);
         }
+        String newPwd = PasswordUtil.authAdminPwd(updatePasswordForm.getOldPassword());
         // 旧密码不对
-        if (!authAdmin.getPassword().equals(PasswordUtil.authAdminPwd(updatePasswordForm.getOldPassword()))) {
+        if (authAdmin.getPassword() != null
+                && !authAdmin.getPassword().equals(newPwd)) {
             throw new JsonException(ResultEnum.DATA_NOT, "旧密码匹配失败");
         }
 
-        authAdmin.setPassword(updatePasswordForm.getNewPassword());
+        AuthAdmin authAdminUp = new AuthAdmin();
+        authAdminUp.setPassword(newPwd);
 
-        return authAdminService.updateAuthAdmin(authAdmin);
+        return authAdminService.updateAuthAdmin(authAdminUp);
     }
 }
diff --git a/admin-api/src/test/com/lmxdawn/admin/service/admin/impl/AuthLoginServiceImplTest.java b/admin-api/src/test/com/lmxdawn/admin/service/admin/impl/AuthLoginServiceImplTest.java
@@ -1,8 +1,12 @@
 package com.lmxdawn.admin.service.admin.impl;
 
 import com.lmxdawn.admin.dto.admin.LoginUserInfoDTO;
+import com.lmxdawn.admin.entity.AuthAdmin;
 import com.lmxdawn.admin.form.admin.LoginForm;
+import com.lmxdawn.admin.form.admin.UpdatePasswordForm;
+import com.lmxdawn.admin.service.admin.AuthAdminService;
 import com.lmxdawn.admin.service.admin.AuthLoginService;
+import com.lmxdawn.admin.utils.PasswordUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -20,6 +24,8 @@ public class AuthLoginServiceImplTest {
 
     @Resource
     private AuthLoginService authLoginService;
+    @Resource
+    private AuthAdminService authAdminService;
 
     @Test
     public void loginToken() {
@@ -40,4 +46,23 @@ public void findByAdminId() {
         System.out.println(loginUserInfoDTO);
         assertNotNull(loginUserInfoDTO);
     }
+
+    @Test
+    public void updatePassword() {
+
+        Long adminId = 1L;
+        String oldPwd = "admin";
+        String newPwd = "admin";
+        UpdatePasswordForm updatePasswordForm = new UpdatePasswordForm();
+        updatePasswordForm.setAdminId(adminId);
+        updatePasswordForm.setNewPassword(newPwd);
+        updatePasswordForm.setOldPassword(oldPwd);
+        boolean b = authLoginService.updatePassword(updatePasswordForm);
+
+        AuthAdmin authAdmin = authAdminService.findPwdById(adminId);
+
+        assertNotNull(authAdmin);
+
+        assertEquals(authAdmin.getPassword(), PasswordUtil.authAdminPwd(newPwd));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public AuthAdmin findById(Long id) {`
`54`	`54`	`*/`
`55`	`55`	`@Override`
`56`	`56`	`public AuthAdmin findPwdById(Long id) {`
`57`		`- return authAdminDao.findById(id);`
	`57`	`+ return authAdminDao.findPwdById(id);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -120,13 +120,16 @@ public boolean updatePassword(UpdatePasswordForm updatePasswordForm) {`
`120`	`120`	`if (authAdmin == null) {`
`121`	`121`	`throw new JsonException(ResultEnum.DATA_NOT);`
`122`	`122`	`}`
	`123`	`+ String newPwd = PasswordUtil.authAdminPwd(updatePasswordForm.getOldPassword());`
`123`	`124`	`// 旧密码不对`
`124`		`- if (!authAdmin.getPassword().equals(PasswordUtil.authAdminPwd(updatePasswordForm.getOldPassword()))) {`
	`125`	`+ if (authAdmin.getPassword() != null`
	`126`	`+ && !authAdmin.getPassword().equals(newPwd)) {`
`125`	`127`	`throw new JsonException(ResultEnum.DATA_NOT, "旧密码匹配失败");`
`126`	`128`	`}`
`127`	`129`
`128`		`- authAdmin.setPassword(updatePasswordForm.getNewPassword());`
	`130`	`+ AuthAdmin authAdminUp = new AuthAdmin();`
	`131`	`+ authAdminUp.setPassword(newPwd);`
`129`	`132`
`130`		`- return authAdminService.updateAuthAdmin(authAdmin);`
	`133`	`+ return authAdminService.updateAuthAdmin(authAdminUp);`
`131`	`134`	`}`
`132`	`135`	`}`