Merge remote-tracking branch 'origin/dev/one' into dev/one

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -529,7 +529,7 @@ public class UserFacade extends UserServiceImpl {
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         if (!StringUtil.isBlank(diffPassword) && "Y".equals(diffPassword)) {
             if (passwordEncoder.matches(password, user.getPassword())) {
-                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "修改后密码不能与修改前相同");
+                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "原密码和新密码不能相同");
             }
         }
         String entryPassword = passwordEncoder.encode(password);

user-service/src/main/java/com/diagbot/vo/ResetPasswordVO.java

@@ -18,5 +18,6 @@ public class ResetPasswordVO {
     private String username;
     @NotBlank(message = "请输入密码!")
     private String password;
+    private String diffPassword; //Y: 修改密码不能相同
 
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -152,12 +152,13 @@ public class UserController {
 
     @ApiOperation(value = "重置密码[by:zhoutg]",
             notes = "username：用户名,必填<br>" +
-                    "password：密码, 必填<br> ")
+                    "password：密码, 必填<br> " +
+                    "diffPassword：标志，Y：修改的密码不能和上次相同,其他值：不作限制")
     @PostMapping("/resetPassword")
     @SysLogger("resetPassword")
     @Transactional
     public RespDTO<Boolean> resetPassword(@RequestBody ResetPasswordVO resetPasswordVO) {
-        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), "N");
+        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), resetPasswordVO.getDiffPassword());
     }