commit

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

@@ -125,10 +125,13 @@ public class AuthController extends Controller {
 
 			signUpRequest.setPassword(encoder.encode(password));
 
+			fixCode(signUpRequest);
 
 			TbCfUserInfo userInfo = userRepository.save(signUpRequest);
 
 
+			addToNetwork(signUpRequest);
+
 			return authenticateUser(new LoginRequest(userInfo.getFirebaseUid(),password,userInfo.getFcm()));
 		}
 		catch (Exception e){
@@ -228,6 +231,26 @@ public class AuthController extends Controller {
 				user.setPassword(encoder.encode(user.getFirebaseUid()));// Assign user from database to the user we have to return back to request
 			}
 
+
+
+			fixCode(user);
+
+			addToNetwork(user);
+
+			user.setLastLoginTime(new Date());
+			userRepository.save(user);
+			//注册成功 创建token
+
+			return authenticateUser(new LoginRequest(user.getFirebaseUid(),user.getFirebaseUid()));
+
+
+		} else {
+			return new Result<>(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(),ResultCodeEnum.ILLEGAL_ARGUMENT.getDesc());
+		}
+
+	}
+
+	private void fixCode(TbCfUserInfo user){
 		if( user.getCode() == null){
 			Hashids hashids = new Hashids("big father is daddy", 6);
 			Long codeCount = user.getCodeCount();
@@ -238,7 +261,9 @@ public class AuthController extends Controller {
 
 			user.setCode(hashids.encode(codeCount));
 		}
+	}
 
+	private void addToNetwork(TbCfUserInfo user){
 		Network top = networkRepository.findTopByOrderByIdDesc();
 
 		if( top != null && !user.invited() ) {
@@ -251,18 +276,6 @@ public class AuthController extends Controller {
 				user.setInvitation(1);
 			}
 		}
-
-			user.setLastLoginTime(new Date());
-			userRepository.save(user);
-			//注册成功 创建token
-
-			return authenticateUser(new LoginRequest(user.getFirebaseUid(),user.getFirebaseUid()));
-
-
-		} else {
-			return new Result<>(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(),ResultCodeEnum.ILLEGAL_ARGUMENT.getDesc());
-		}
-
 	}
 
 	private void fillUserNecessayInfo(TbCfUserInfo tbCfUserInfoVo) {