Merge branch 'dev'

src/main/java/com/izouma/nineth/service/IdentityAuthService.java

@@ -68,15 +68,18 @@ public class IdentityAuthService {
             throw new BusinessException("已经审核过");
         }
         User user = userRepo.findByIdAndDelFalse(auth.getUserId()).orElseThrow(new BusinessException("用户不存在"));
-        if (status == AuthStatus.SUCCESS) {
-            user.setAuthId(auth.getId());
+        if (user.getAuthStatus() != AuthStatus.SUCCESS) {
+            if (status == AuthStatus.SUCCESS) {
+                user.setAuthId(auth.getId());
+            }
+            user.setAuthStatus(status);
+            userRepo.save(user);
         }
         auth.setStatus(status);
         auth.setReason(reason);
         auth.setAutoValidated(true);
         identityAuthRepo.save(auth);
-        user.setAuthStatus(status);
-        userRepo.save(user);
+
     }
 
     public List<User> repeat(String idNo, Long userId) {

src/main/java/com/izouma/nineth/web/AuthenticationController.java

@@ -71,8 +71,8 @@ public class AuthenticationController {
     @ApiOperation(value = "手机号密码注册")
     public String phonePwdLogin(String phone, String code, String password, String inviteCode, Long invitor,
                                 Long collectionId, String captcha, String captchaKey) {
-        boolean verify = captchaService.verify(captcha, captchaKey);
-        if (!verify){
+        boolean verify = captchaService.verify(captchaKey, captcha);
+        if (!verify) {
             throw new BusinessException("验证码错误");
         }
         User user = userService.phoneRegister(phone, code, password, inviteCode, invitor, collectionId);