|
|
@@ -124,16 +124,17 @@ public class UserServiceImpl implements UserService {
|
|
|
*/
|
|
|
@Override
|
|
|
public User register(User user) {
|
|
|
- List<User> existUsers = userDao.findByEmail(user.getEmail());
|
|
|
- if (!CollectionUtils.isEmpty(existUsers)) {
|
|
|
- user.setId(existUsers.get(0).getId());
|
|
|
- }
|
|
|
if (user.getEmail().contains(Constant.EMAIL_SUFFIX)) {
|
|
|
String name = user.getEmail().substring(0, user.getEmail().indexOf("@"));
|
|
|
user.setName(name);
|
|
|
+ } else {
|
|
|
+ user.setEmail(user.getEmail() + Constant.EMAIL_SUFFIX);
|
|
|
+ }
|
|
|
+ List<User> existUsers = userDao.findByEmail(user.getEmail());
|
|
|
+ if (!CollectionUtils.isEmpty(existUsers)) {
|
|
|
+ user.setId(existUsers.get(0).getId());
|
|
|
}
|
|
|
user.setPassword(Md5Utils.encode(user.getPassword(), user.getName()));
|
|
|
- user.setEmail(user.getEmail() + Constant.EMAIL_SUFFIX);
|
|
|
return userDao.save(user);
|
|
|
}
|
|
|
|