commit commit

src/main/java/com/example/afrishop_v3/controllers/UserController.java

@@ -55,6 +55,11 @@ public class UserController extends Controller {
                 if( b ){
                     return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Email is already taken");
                 }
+
+                if( email.equals(user.getEmail()) ){
+                    return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Same email address");
+                }
+
                 if( user.getEmail() != null && user.getEmail().equals(user.getFirebaseUid())){
                     user.setFirebaseUid(email);
                 }
@@ -73,6 +78,11 @@ public class UserController extends Controller {
                 if( b ){
                     return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Phone number is already taken");
                 }
+
+
+                if( phone.equals(user.getPhone()) ){
+                    return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Same phone number");
+                }
                 user.setPhone(phone);
                 user.setVerificationCode(null);
             }else return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Code verification error");
@@ -181,6 +191,13 @@ public class UserController extends Controller {
 
         if( !matches ){
             return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Old password does not match");
+
+        }
+
+        boolean matches1 = encoder.matches(body.getNewPassword(), user.getPassword());
+
+        if( matches1 ){
+            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Can’t change to the same password as last time");
         }
 
         user.setPassword(encoder.encode(body.getNewPassword()));

src/main/java/com/example/afrishop_v3/models/TbCfAddress.java

@@ -78,6 +78,10 @@ public class TbCfAddress{
      * 标签code
      */
     private String labelCode;
+    /**
+     * Phone code
+     */
+    private String phoneCode;
     /**
      * 创建时间
      */