Browse Source

更新找回密码地址,更新注册方法

hejq 7 năm trước cách đây
mục cha
commit
4d554e065b

+ 3 - 2
src/main/java/com/uas/platform/b2b/manage/model/Constant.java

@@ -3,7 +3,8 @@ package com.uas.platform.b2b.manage.model;
 /**
  * 常量
  *
- * Created by hejq on 2018-04-27.
+ * @author hejq
+ * @date 2018-04-27
  */
 public class Constant {
 
@@ -21,7 +22,7 @@ public class Constant {
     /**
      * 管理平台地址
      */
-    public static final String MANAGEURL = "http://192.168.253.12:23396";
+    public static final String MANAGEURL = "https://b2b-admin.usoftchina.com";
 
     /**
      * 失效链接地址

+ 9 - 5
src/main/java/com/uas/platform/b2b/manage/service/impl/UserServiceImpl.java

@@ -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);
     }