|
|
@@ -1,6 +1,5 @@
|
|
|
package com.uas.platform.b2b.manage.service.impl;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.uas.platform.b2b.manage.core.support.SystemSession;
|
|
|
import com.uas.platform.b2b.manage.dao.UserDao;
|
|
|
import com.uas.platform.b2b.manage.model.Constant;
|
|
|
@@ -13,7 +12,6 @@ import com.uas.platform.b2b.manage.model.SecretKeyRecord;
|
|
|
import com.uas.platform.b2b.manage.model.User;
|
|
|
import com.uas.platform.b2b.manage.support.MyException;
|
|
|
import com.uas.platform.b2b.manage.support.SecurityConstant;
|
|
|
-import com.uas.platform.b2b.manage.utils.EncryptUtils;
|
|
|
import com.uas.platform.core.util.encry.Md5Utils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
|
|
@@ -126,10 +124,16 @@ public class UserServiceImpl implements UserService {
|
|
|
*/
|
|
|
@Override
|
|
|
public User register(User user) {
|
|
|
- String name = user.getEmail().substring(0, user.getEmail().indexOf("@"));
|
|
|
- user.setPassword(Md5Utils.encode(user.getPassword(), name));
|
|
|
+ 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);
|
|
|
+ }
|
|
|
+ user.setPassword(Md5Utils.encode(user.getPassword(), user.getName()));
|
|
|
user.setEmail(user.getEmail() + Constant.EMAIL_SUFFIX);
|
|
|
- user.setName(name);
|
|
|
return userDao.save(user);
|
|
|
}
|
|
|
|