|
|
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.List;
|
|
|
+import java.util.Optional;
|
|
|
|
|
|
/**
|
|
|
* @author Kunduin
|
|
|
@@ -90,20 +91,20 @@ public class UserService {
|
|
|
throw CustomErrorException.phoneAlreadyExist();
|
|
|
});
|
|
|
User user = userMapper.userVOToUser(userVO);
|
|
|
- System.out.println(user.getId()+user.getName()+user.getEmail()+user.getPhone());
|
|
|
+ //System.out.println(user.getId()+user.getName()+user.getEmail()+user.getPhone());
|
|
|
String encodedPassword = passwordEncoder.encode(password);
|
|
|
System.out.println(encodedPassword);
|
|
|
user.setPassword(encodedPassword);
|
|
|
- User savedUser = userRepository.save(user);
|
|
|
- System.out.println(savedUser.getId()+savedUser.getEmail()+savedUser.getName()+savedUser.getRole());
|
|
|
+ userRepository.save(user);
|
|
|
+ Optional<User> resultUser=userRepository.findByPhone(user.getPhone());
|
|
|
/*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: {}",savedUser);
|
|
|
- return savedUser;
|
|
|
+ log.debug("Created Information for User: {}",resultUser.get());
|
|
|
+ return resultUser.get();
|
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = RuntimeException.class)
|