Browse Source

删除确认新密码验证

zhanghang 4 years ago
parent
commit
d3de66238e

+ 1 - 10
src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -257,7 +257,7 @@ public class SysUserFacade extends SysUserServiceImpl {
      * @param modifyPassword 新密码
      * @return 修改密码是否成功
      */
-    public Boolean modifyPassword(String password, String modifyPassword,String confirmModifyPassword) {
+    public Boolean modifyPassword(String password, String modifyPassword) {
         //使用MD5对原密码和新密码进行加密
         String MD5Password = DigestUtils.md5DigestAsHex(password.getBytes());
         String MD5ModifyPassword = DigestUtils.md5DigestAsHex(modifyPassword.getBytes());
@@ -269,10 +269,6 @@ public class SysUserFacade extends SysUserServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "请输入新密码");
         }
-        if (StringUtil.isBlank(confirmModifyPassword)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入确认新密码");
-        }
         //对传入的密码进行格式验证
         String hospitalID = SysUserUtils.getCurrentHospitalID();
         Boolean regularBoolean = passwordRegular(modifyPassword,hospitalID);
@@ -296,11 +292,6 @@ public class SysUserFacade extends SysUserServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,
                     "原密码和新密码不能相同");
         }
-        //“原密码”正确、“新密码”符合密码规则且不与原密码相同,新密码与确认新密码不一致
-        if(!modifyPassword.equals(confirmModifyPassword)){
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,
-                    "两次密码输入不一致");
-        }
         String entryPassword = passwordEncoder.encode(MD5ModifyPassword);
         user.setPassword(entryPassword);
         user.setGmtModified(DateUtil.now());

+ 2 - 3
src/main/java/com/diagbot/web/SysUserController.java

@@ -98,13 +98,12 @@ public class SysUserController {
 
     @ApiOperation(value = "修改密码[by:gaodm]",
             notes = "password:原密码,必填<br>" +
-                    "modifyPassword:新密码, 必填<br> "+
-                    "confirmModifyPassword:确认新密码, 必填<br> ")
+                    "modifyPassword:新密码, 必填<br> ")
     @PostMapping("/midifyPassword")
     @SysLogger("midifyPassword")
     @Transactional
     public RespDTO<Boolean> midifyPassword(@RequestBody ModifyPasswordVO modifyPasswordVO) {
-        Boolean flag = userFacade.modifyPassword(modifyPasswordVO.getPassword(), modifyPasswordVO.getModifyPassword(),modifyPasswordVO.getConfirmModifyPassword());
+        Boolean flag = userFacade.modifyPassword(modifyPasswordVO.getPassword(), modifyPasswordVO.getModifyPassword());
         return RespDTO.onSuc(flag);
     }