修复使用超级验证码修改密码时，可能提示验证码过期问题

wildfirechat · Jul 19, 2023 · be4dda1 · be4dda1
1 parent 8703b64
commit be4dda1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/cn/wildfirechat/app/ServiceImpl.java b/src/main/java/cn/wildfirechat/app/ServiceImpl.java
@@ -453,10 +453,10 @@ public RestResult resetPassword(String mobile, String resetCode, String newPwd)
         Optional<UserPassword> optional = userPasswordRepository.findById(userId);
         if (optional.isPresent()) {
             UserPassword up = optional.get();
+            if (resetCode.equals(up.getResetCode()) && System.currentTimeMillis() - up.getResetCodeTime() > 10 * 60 * 60 * 1000){
+                return RestResult.error(ERROR_CODE_EXPIRED);
+            }
             if(resetCode.equals(up.getResetCode()) || (!StringUtils.isEmpty(superCode) && resetCode.equals(superCode))) {
-                if (System.currentTimeMillis() - up.getResetCodeTime() > 10 * 60 * 60 * 1000) {
-                    return RestResult.error(ERROR_CODE_EXPIRED);
-                }
                 try {
                     changePassword(up, newPwd);
                     up.setResetCode(null);