|
|
@@ -84,7 +84,7 @@ public class UserService {
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|
|
|
public User registerUser(UserVO userVO, String password, String phoneCode) {
|
|
|
checkPhoneMessageOrThrowError(userVO.getPhone(), phoneCode);
|
|
|
-
|
|
|
+ userVO.setUsername(userVO.getName());
|
|
|
userRepository
|
|
|
.findByPhoneOrUsername(userVO.getPhone(), userVO.getUsername())
|
|
|
.ifPresent(user -> {
|
|
|
@@ -96,19 +96,19 @@ public class UserService {
|
|
|
user.setPassword(encodedPassword);
|
|
|
System.out.println(1);
|
|
|
System.out.println(userVO.getUsername());
|
|
|
- userRepository.save(user);
|
|
|
- Optional<User> resultUser=userRepository.findByPhone(user.getPhone());
|
|
|
+ User savedUser=userRepository.save(user);
|
|
|
+ //Optional<User> resultUser=userRepository.findByPhone(user.getPhone());
|
|
|
System.out.println(2);
|
|
|
- System.out.println(user.getUsername());
|
|
|
- System.out.println(resultUser.get().getUsername());
|
|
|
- /*try {
|
|
|
+ System.out.println(savedUser.getUsername());
|
|
|
+ //System.out.println(resultUser.get().getUsername());
|
|
|
+ try {
|
|
|
gitlabService.createGitlabUser(Math.toIntExact(savedUser.getId()), savedUser.getUsername(), password, savedUser.getEmail());
|
|
|
} catch (SeecoderGitlabException e) {
|
|
|
userRepository.delete(savedUser);
|
|
|
throw new CustomErrorException("gitlab 创建异常");
|
|
|
- }*/
|
|
|
- log.debug("Created Information for User: {}",resultUser.get());
|
|
|
- return resultUser.get();
|
|
|
+ }
|
|
|
+ log.debug("Created Information for User: {}",savedUser);
|
|
|
+ return savedUser;
|
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|