增加 user 使用 mobile 认证的逻辑

user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java

@@ -10,6 +10,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
+@Deprecated
 public class UserRegisterDO {
 
     /**

user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/MobileCodeServiceImpl.java

@@ -1,80 +0,0 @@
-package cn.iocoder.mall.user.biz.service;
-
-import cn.iocoder.common.framework.constant.SysErrorCodeEnum;
-import cn.iocoder.common.framework.util.ServiceExceptionUtil;
-import cn.iocoder.common.framework.util.ValidationUtil;
-import cn.iocoder.mall.user.api.MobileCodeService;
-import cn.iocoder.mall.user.api.constant.UserErrorCodeEnum;
-import cn.iocoder.mall.user.biz.dao.MobileCodeMapper;
-import cn.iocoder.mall.user.biz.dataobject.MobileCodeDO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-/**
- * MobileCodeService ，实现用户登陆时需要的验证码
- */
-@Service
-@org.apache.dubbo.config.annotation.Service(validation = "true", version = "${dubbo.provider.MobileCodeService.version}")
-public class MobileCodeServiceImpl implements MobileCodeService {
-
-    /**
-     * 每条验证码的过期时间，单位：毫秒
-     */
-    @Value("${modules.mobile-code-service.code-expire-time-millis}")
-    private int codeExpireTimes;
-    /**
-     * 每日发送最大数量
-     */
-    @Value("${modules.mobile-code-service.send-maximum-quantity-per-day}")
-    private int sendMaximumQuantityPerDay;
-    /**
-     * 短信发送频率，单位：毫秒
-     */
-    @Value("${modules.mobile-code-service.send-frequency}")
-    private int sendFrequency;
-
-    @Autowired
-    private MobileCodeMapper mobileCodeMapper;
-    @Autowired
-    private UserServiceImpl userService;
-
-    /**
-     * 校验手机号的最后一个手机验证码是否有效
-     *
-     * @param mobile 手机号
-     * @param code 验证码
-     * @return 手机验证码信息
-     */
-    public MobileCodeDO validLastMobileCode(String mobile, String code) {
-//        return new MobileCodeDO().setCode(code).setCreateTime(new Date()).setId(1);
-        MobileCodeDO mobileCodePO = mobileCodeMapper.selectLast1ByMobile(mobile);
-        if (mobileCodePO == null) { // 若验证码不存在，抛出异常
-            throw ServiceExceptionUtil.exception(UserErrorCodeEnum.MOBILE_CODE_NOT_FOUND.getCode());
-        }
-        if (System.currentTimeMillis() - mobileCodePO.getCreateTime().getTime() >= codeExpireTimes) { // 验证码已过期
-            throw ServiceExceptionUtil.exception(UserErrorCodeEnum.MOBILE_CODE_EXPIRED.getCode());
-        }
-        if (mobileCodePO.getUsed()) { // 验证码已使用
-            throw ServiceExceptionUtil.exception(UserErrorCodeEnum.MOBILE_CODE_USED.getCode());
-        }
-        if (!mobileCodePO.getCode().equals(code)) {
-            throw ServiceExceptionUtil.exception(UserErrorCodeEnum.MOBILE_CODE_NOT_CORRECT.getCode());
-        }
-        return mobileCodePO;
-    }
-
-    /**
-     * 更新手机验证码已使用
-     *
-     * @param id 验证码编号
-     * @param userId 用户编号
-     */
-    public void useMobileCode(Integer id, Integer userId) {
-        MobileCodeDO update = new MobileCodeDO().setId(id).setUsed(true).setUsedUserId(userId).setUsedTime(new Date());
-        mobileCodeMapper.updateById(update);
-    }
-
-}

user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/service/UserServiceImpl.java

@@ -43,8 +43,6 @@ public class UserServiceImpl implements UserService {
     private UserMapper userMapper;
     @Autowired
     private UserRegisterMapper userRegisterMapper;
-    @Autowired
-    private MobileCodeServiceImpl mobileCodeService;
 
     @Reference(validation = "true", version = "${dubbo.consumer.OAuth2Service.version}")
     private OAuth2Service oAuth2Service;
@@ -79,36 +77,6 @@ public class UserServiceImpl implements UserService {
         userRegisterMapper.insert(userRegisterDO);
     }
 
-    @Override
-    @Transactional
-    public UserAuthenticationBO authenticationByMobileCode(UserAuthenticationByMobileCodeDTO userAuthenticationByMobileCodeDTO) {
-        String mobile = userAuthenticationByMobileCodeDTO.getMobile();
-        String code = userAuthenticationByMobileCodeDTO.getCode();
-        // 校验手机格式
-        if (!ValidationUtil.isMobile(mobile)) {
-            throw ServiceExceptionUtil.exception(SysErrorCodeEnum.VALIDATION_REQUEST_PARAM_ERROR.getCode(), "手机格式不正确"); // TODO 有点搓
-        }
-        // 校验验证码是否正确
-        MobileCodeDO mobileCodeDO = mobileCodeService.validLastMobileCode(mobile, code);
-        // 获得用户
-        UserDO user = userMapper.selectByMobile(mobile);
-        if (user == null) { // 用户不存在，则进行创建
-            user = new UserDO().setMobile(mobile).setStatus(UserConstants.STATUS_ENABLE);
-            user.setCreateTime(new Date());
-            user.setDeleted(DeletedStatusEnum.DELETED_NO.getValue());
-            userMapper.insert(user);
-            // 插入注册信息 TODO 芋艿 后续完善，记录 ip、ua 等等
-            createUserRegister(user);
-        }
-        // 更新验证码已使用
-        mobileCodeService.useMobileCode(mobileCodeDO.getId(), user.getId());
-        // 创建 accessToken
-        OAuth2AccessTokenBO accessTokenBO = oAuth2Service.createToken(new OAuth2CreateTokenDTO().setUserId(user.getId())
-                .setUserType(UserTypeEnum.USER.getValue()));
-        // 转换返回
-        return UserConvert.INSTANCE.convert2(user).setToken(accessTokenBO);
-    }
-
     @Override
     public UserPageBO getUserPage(UserPageDTO userPageDTO) {
         UserPageBO userPageBO = new UserPageBO();