替换其余注册接口

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

 package cn.quantgroup.xyqb.controller.external.user;
 
-import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Merchant;
 import cn.quantgroup.xyqb.entity.User;
-import cn.quantgroup.xyqb.entity.UserBtRegister;
-import cn.quantgroup.xyqb.entity.UserDetail;
-import cn.quantgroup.xyqb.model.*;
+import cn.quantgroup.xyqb.model.AuthBean;
+import cn.quantgroup.xyqb.model.JsonResult;
+import cn.quantgroup.xyqb.model.LoginProperties;
+import cn.quantgroup.xyqb.model.UserRet;
 import cn.quantgroup.xyqb.model.session.LoginInfo;
 import cn.quantgroup.xyqb.model.session.SessionStruct;
 import cn.quantgroup.xyqb.repository.IUserRepository;
@@ -21,10 +21,7 @@ import cn.quantgroup.xyqb.service.user.IUserBtRegisterService;
 import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.IPUtil;
-import cn.quantgroup.xyqb.util.MqUtils;
-import cn.quantgroup.xyqb.util.PasswordUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +30,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.sql.Timestamp;
 import java.util.Random;
 
 import static cn.quantgroup.xyqb.constant.UserConstant.USER_ERROR_OR_PASSWORD_ERROR;
@@ -86,7 +82,6 @@ public class AppController implements IBaseController {
     LOGGER.info("第三方用户登录 login --> loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom,channelId,btRegisterChannelId, IPUtil.getRemoteIP(request),idNo,name);
     User user = userService.findByPhoneInDb(phoneNo);
     if (user == null) {
-//      user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId); TODO
       user = userRegisterService.register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
     }
     if (user == null) {
@@ -171,7 +166,6 @@ public class AppController implements IBaseController {
     LOGGER.info("第三方用户登录 loginSuper --> loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom,channelId,btRegisterChannelId, IPUtil.getRemoteIP(request),idNo,name);
     User user = userService.findByPhoneInDb(phoneNo);
     if (user == null) {
-//      user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId); TODO
       user = userRegisterService.register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
     }
     if (user == null) {
@@ -206,83 +200,4 @@ public class AppController implements IBaseController {
 
   }
 
-  /**
-   * 注册新用户，带白条渠道号
-   * @param registerFrom
-   * @param phoneNo
-   * @param idNo
-   * @param name
-   * @param channelId
-   * @param btRegisterChannelId
-   * @return
-   */
-  private User register(Long registerFrom, String phoneNo, String idNo, String name, Long channelId, Long btRegisterChannelId) {
-    User user = register(registerFrom, phoneNo, idNo, name, channelId);
-    if(null != user && null != btRegisterChannelId && channelId == 222L) {
-      UserBtRegister userBtRegister = new UserBtRegister();
-      userBtRegister.setUserId(user.getId());
-      userBtRegister.setRegisterBtMerchantId(btRegisterChannelId);
-      userBtRegisterService.save(userBtRegister);
-    }
-    return user;
-  }
-
-  /**
-   * 注册新用户
-   *
-   * @return
-   */
-  private User register(Long registerFrom, String phoneNo, String idNo, String name, Long channelId) {
-    String randomCode = String.valueOf(random.nextInt(899999) + 100000);
-    String uuid = lkbUserService.registerApp(phoneNo, randomCode);
-    Timestamp currentTime = new Timestamp(System.currentTimeMillis());
-    LOGGER.info("第三方登录用户，保存 User");
-    User user = new User();
-    if (channelId == 222L) {
-      user.setRegisteredFrom(channelId);
-    } else {
-      user.setRegisteredFrom(registerFrom);
-    }
-    user.setUuid(uuid);
-    user.setEnable(true);
-    user.setPhoneNo(phoneNo);
-    user.setPassword(PasswordUtil.MD5(randomCode + Constants.PASSWORD_SALT));
-    user.setUpdatedAt(currentTime);
-    user.setCreatedAt(currentTime);
-    userRepository.saveAndFlush(user);
-
-    if(registerFrom == 900L){
-      smsService.sendAfterRegister(phoneNo,"123");
-      LOGGER.info("第三方(聚美)登录用户注册成功, registerFrom:{}, phoneNo:{},idNo:{},name:{} 并且已发送短信通知", registerFrom, phoneNo, idNo, name);
-    }else if (registerFrom != 645L) {
-      smsService.sendAfterRegister(phoneNo);
-      LOGGER.info("第三方登录用户注册成功, registerFrom:{}, phoneNo:{}, 并且已发送短信通知", registerFrom, phoneNo);
-    }
-
-    if (StringUtils.isNotBlank(idNo) && StringUtils.isNotBlank(name) && ValidationUtil.validateChinese(name)) {
-      LOGGER.info("第三方登录用户，保存 UserDetail");
-      IdCardInfo cardInfo;
-      try {
-        cardInfo = idCardService.getIdCardInfoWithExceptions(idNo);
-
-        UserDetail userDetail = new UserDetail();
-        userDetail.setIdNo(cardInfo.getIdNo());
-        userDetail.setPhoneNo(phoneNo);
-        userDetail.setName(name);
-        userDetail.setIdType(IdType.ID_CARD);
-        userDetail.setCreatedAt(currentTime);
-        userDetail.setUpdatedAt(currentTime);
-        userDetail.setUserId(user.getId());
-        userDetail.setGender(cardInfo.getGender());
-        userDetailService.saveUserDetail(userDetail);
-
-        lkbUserService.userUpdate(user.getUuid(), name, idNo);
-      } catch (Exception e) {
-        LOGGER.error("保存 UserDetail 出现异常", e);
-      }
-    }
-    MqUtils.sendRegisterMessage(channelId,null,user);
-    return user;
-  }
-
 }

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -919,8 +919,7 @@ public class InnerController implements IBaseController {
       return JsonResult.buildErrorStateResult("用户已存在，手机号被占用", null);
     }
 
-    user = userService.registerAndReturn(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
-//    user = userRegisterService.register(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts); TODO
+    user = userRegisterService.register(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
 
     UserRet userRet = new UserRet(user);
     return JsonResult.buildSuccessResult(null, userRet);
@@ -934,8 +933,7 @@ public class InnerController implements IBaseController {
     LOGGER.info("[/innerapi/user/register]channelId={},ip={}", channelId, getIp());
     User user = userService.findByPhoneInDb(phoneNo);
     if (user == null) {
-      user = userService.registerAndReturn(phoneNo, StringUtils.defaultString(password, ""), channelId);
-//      user = userRegisterService.register(phoneNo, StringUtils.defaultString(password, ""), channelId); TODO
+      user = userRegisterService.register(phoneNo, StringUtils.defaultString(password, ""), channelId);
     }
     if (user == null) {
       return JsonResult.buildErrorStateResult("注册失败", null);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -194,8 +194,7 @@ public class UserController implements IBaseController {
       return JsonResult.buildErrorStateResult("登录失败", null);
     }
     if (user == null) {
-      user = registerFastWhenLogin(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension);
-//      user = userRegisterService.register(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension); TODO
+      user = userRegisterService.register(phoneNo, channelId, createdFrom, appChannel,btRegisterChannelId,dimension);
       if (user == null) {
         throw new UserNotExistException("用户未找到");
       }
@@ -207,25 +206,6 @@ public class UserController implements IBaseController {
     // return createSession(channelId, createdFrom, appChannel, user);
   }
 
-  private User registerFastWhenLogin(String phoneNo, Long channelId, Long registerFrom, String appChannel, Long btRegisterChannelId,String dimension) {
-    String password = PasswordUtil.generateRandomPwd(15);
-    LOGGER.info("用户快速注册：login/fast -> phoneNo:{}, channelId:{}, registerFrom:{},appChannel:{},btRegisterChannelId:{}", phoneNo, channelId, registerFrom, appChannel,btRegisterChannelId);
-    if (!ValidationUtil.validatePhoneNo(phoneNo)) {
-      LOGGER.info("用户快速注册失败，手机号错误：login/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
-      throw new UserNotExistException("手机号错误");
-    }
-    if (null == registerFrom) {
-      registerFrom = 1L;
-    }
-    if (channelId == 222L) {
-      registerFrom=222L;
-    }
-    User user=userService.registerAndReturn(phoneNo, password, registerFrom,btRegisterChannelId);
-    LOGGER.info("用户快速注册成功：login/fast -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
-     MqUtils.sendRegisterMessage(channelId,dimension, user);
-    return user;
-  }
-
   /**
    * 快速登录验证
    *
@@ -298,8 +278,7 @@ public class UserController implements IBaseController {
       LOGGER.info("用户注册失败，该手机号已经被注册：register -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("该手机号已经被注册", null);
     }
-    if (!userService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) {
-//    if (!userRegisterService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) { TODO
+    if (!userRegisterService.register(phoneNo, password, registerFrom, getIp(), channelId,btRegisterChannelId,dimension)) {
       LOGGER.info("用户快速注册失败，请稍后重试, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
       return JsonResult.buildErrorStateResult("注册失败，请稍后重试", null);
     }

src/main/java/cn/quantgroup/xyqb/service/register/handler/impl/BaseUserRegisterHandler.java

@@ -10,6 +10,7 @@ import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.JsonUtil;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
@@ -68,11 +69,11 @@ public class BaseUserRegisterHandler extends AbstractUserRegisterHandler {
         } else {
             user.setRegisteredFrom(registerFrom);
         }
-        String password = userRegisterParam.getPassword();
+        String password = StringUtils.defaultString(userRegisterParam.getPassword(), "");
         if (userRegisterParam.isGenerateRandomPwd()){ // 如果需要生成随机密码
             password = PasswordUtil.generateRandomPwd(Constants.RANDOM_PWD_LEN);
         }
-        user.setPassword(PasswordUtil.MD5(password + Constants.PASSWORD_SALT));
+        user.setPassword(PasswordUtil.MD5(password.toLowerCase() + Constants.PASSWORD_SALT));
         Timestamp currentTime = new Timestamp(System.currentTimeMillis());
         user.setUpdatedAt(currentTime);
         user.setCreatedAt(currentTime);

src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java

@@ -14,8 +14,6 @@ public interface IUserService {
 
   User findByUuidWithCache(String uuid);
 
-  User registerAndReturn(String phoneNo, String password, Long registerFrom);
-
   boolean exist(String phoneNo);
 
   boolean resetPassword(String phoneNo, String password);
@@ -30,42 +28,8 @@ public interface IUserService {
 
   User findById(Long userId);
 
-  boolean register(String phoneNo, String password, Long registerFrom, String ip, Long channelId, Long btRegisterChannelId,String dimension);
   List<User> findByPhones(List<String> phones);
 
-  User registerAndReturn(String phoneNo, String password, Long registerFrom, Long btRegisterChannelId);
-
-  /**
-   * 用户、联系人、地址信息注册
-   * @param registeredFrom
-   * @param channelId
-   * @param phoneNo
-   * @param name
-   * @param idNo
-   * @param provinceCode
-   * @param province
-   * @param cityCode
-   * @param city
-   * @param districtCode
-   * @param district
-   * @param address
-   * @param contacts
-   * @return
-   */
-  User registerAndReturn( Long registeredFrom,
-                          Long channelId,
-                          String phoneNo,
-                          String name,
-                          String idNo,
-                          String provinceCode,
-                          String province,
-                          String cityCode,
-                          String city,
-                          String districtCode,
-                          String district,
-                          String address,
-                          String contacts);
-
   List<User> findRegisterUserByTime(String beginTime,String endTime);
 
   /**

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -15,7 +15,6 @@ import cn.quantgroup.xyqb.service.user.ILkbUserService;
 import cn.quantgroup.xyqb.service.user.IUserBtRegisterService;
 import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
-import cn.quantgroup.xyqb.util.MqUtils;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -132,84 +131,6 @@ public class UserServiceImpl implements IUserService {
     });
   }
 
-  @Override
-  public User registerAndReturn(String phoneNo, String password, Long registerFrom, Long btRegisterChannelId) {
-    User user = registerAndReturn(phoneNo, password, registerFrom);
-    if(null != user &&  null != btRegisterChannelId){
-      UserBtRegister userBtRegister = new UserBtRegister();
-      userBtRegister.setUserId(user.getId());
-      userBtRegister.setRegisterBtMerchantId(btRegisterChannelId);
-      userBtRegisterService.save(userBtRegister);
-      log.info("白条注册渠道信息保存完成,user:[{}],userBtRegister:[{}]",user,userBtRegister);
-    }
-    return user;
-  }
-
-
-  @Override
-  public boolean register(String phoneNo, String password, Long registerFrom, String ip, Long channelId, Long btRegisterChannelId,String dimension) {
-    String uuid = lkbUserService.registerApp(phoneNo, password);
-    Timestamp currentTime = new Timestamp(System.currentTimeMillis());
-
-    User user = new User();
-    user.setEnable(true);
-    user.setPhoneNo(phoneNo);
-    user.setUpdatedAt(currentTime);
-    user.setCreatedAt(currentTime);
-    user.setUuid(uuid);
-    user.setPassword(PasswordUtil.MD5(password.toLowerCase() + Constants.PASSWORD_SALT));
-    //解决线上白条registerFrom为1的问题
-    if (channelId == 222L) {
-      user.setRegisteredFrom(channelId);
-    } else {
-      user.setRegisteredFrom(registerFrom);
-    }
-    //user.setRegisteredFrom(registerFrom);
-
-    user = userRepository.save(user);
-    boolean registerSuccess=false;
-    if(null != user){
-      UserBtRegister userBtRegister = new UserBtRegister();
-      userBtRegister.setUserId(user.getId());
-      if(null==btRegisterChannelId){
-        userBtRegister.setRegisterBtMerchantId(0L);
-      }else{
-        userBtRegister.setRegisterBtMerchantId(btRegisterChannelId);
-      }
-
-      userBtRegisterService.save(userBtRegister);
-      log.info("白条注册渠道信息保存完成");
-      registerSuccess=true;
-    }
-
-    if(registerFrom!=158412){////网易KA引入注册时不发送短信提醒
-      smsService.sendAfterRegister(phoneNo);
-    }
-    if(registerSuccess){
-      MqUtils.sendRegisterMessage(channelId,dimension, user);
-    }
-    return user != null;
-  }
-
-
-  @Override
-  public User registerAndReturn(String phoneNo, String password, Long registerFrom) {
-    String uuid = lkbUserService.registerApp(phoneNo, password);
-    Timestamp currentTime = new Timestamp(System.currentTimeMillis());
-
-    User user = new User();
-    user.setEnable(true);
-    user.setPhoneNo(phoneNo);
-    user.setUpdatedAt(currentTime);
-    user.setCreatedAt(currentTime);
-    user.setUuid(uuid);
-    user.setPassword(PasswordUtil.MD5(password.toLowerCase() + Constants.PASSWORD_SALT));
-    user.setRegisteredFrom(registerFrom);
-
-    return userRepository.save(user);
-  }
-
-
   @Override
   @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
   public User findByPhoneWithCache(String phone) {
@@ -251,88 +172,6 @@ public class UserServiceImpl implements IUserService {
 
   }
 
-  @Override
-  @Transactional(value = Transactional.TxType.REQUIRED,rollbackOn = Exception.class)
-  public User registerAndReturn(Long registeredFrom, Long channelId, String phoneNo, String name, String idNo, String provinceCode, String province, String cityCode, String city, String districtCode, String district, String address, String contacts) {
-    // 用户信息
-    User user = new User();
-    user.setPhoneNo(phoneNo);
-
-    Timestamp now = new Timestamp(System.currentTimeMillis());
-
-    user.setCreatedAt(now);
-    user.setUpdatedAt(now);
-    user.setEnable(true);
-
-    UserBtRegister userBtRegister = null;
-    // 白条渠道，需要设置`xyqb_user`.`user_bt_register`
-    if (BAITIAO_CHANNEL.equals(channelId)) {
-      user.setRegisteredFrom(channelId);
-      userBtRegister = new UserBtRegister();
-
-    } else {
-      user.setRegisteredFrom(registeredFrom);
-    }
-
-    String randomCode = String.valueOf(random.nextInt(899999) + 100000);
-    String uuid = lkbUserService.registerApp(phoneNo, randomCode);
-    user.setUuid(uuid);
-    user.setPassword(PasswordUtil.MD5(randomCode + Constants.PASSWORD_SALT));
-    user = userRepository.save(user);
-    Long userId = user.getId();
-
-    if (null != userBtRegister){
-      userBtRegister.setUserId(userId);
-      userBtRegister.setIsActive(true);
-      userBtRegister.setRegisterBtMerchantId(registeredFrom);
-      userBtRegister.setCreatedAt(now);
-      userBtRegister.setUpdatedAt(now);
-      userBtRegisterRepository.save(userBtRegister);
-    }
-
-    // 地址信息
-    Address addressObj = new Address();
-    addressObj.setUserId(userId);
-    addressObj.setProvinceCode(Long.valueOf(provinceCode));
-    addressObj.setProvince(province);
-    addressObj.setCityCode(Long.valueOf(cityCode));
-    addressObj.setCity(city);
-    addressObj.setDistrictCode(Long.valueOf(districtCode));
-    addressObj.setDistrict(district);
-    addressObj.setAddress(address);
-    addressObj.setCreatedAt(now);
-    addressObj.setUpdateAt(now);
-    addressRepository.save(addressObj);
-    try{
-      IdCardInfo idCardInfo = idCardService.getIdCardInfo(idNo);
-      UserDetail userDetail = new UserDetail();
-      userDetail.setPhoneNo(phoneNo);
-      userDetail.setIdNo(idNo);
-      userDetail.setUserId(userId);
-      userDetail.setName(name);
-      userDetail.setGender(idCardInfo.getGender());
-      userDetail.setIdType(IdType.ID_CARD);
-      userDetail.setCreatedAt(now);
-      userDetail.setUpdatedAt(now);
-      userDetailRepository.saveUserDetail(userDetail);
-    }catch (Exception e){
-      throw  new RuntimeException("idCardService Exception");
-    }
-
-
-    // 联系人信息
-    if (org.apache.commons.lang3.StringUtils.isNotBlank(contacts)) {
-      List<Contact> contactList = JSONObject.parseObject(contacts, new TypeReference<List<Contact>>() { });
-
-      if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contactList)) {
-        convertContactList(userId, contactList, 2, now);
-        contactRepository.save(contactList);
-      }
-    }
-
-    return user;
-  }
-
   @Override
   public List<User> findRegisterUserByTime(String beginTime, String endTime) {
     return userRepository.findRegisterUserByTime(beginTime,endTime);