|
@@ -36,6 +36,7 @@ import com.cyksj.service.mange.coupon.CouponCommonService;
|
|
|
import com.cyksj.service.market.task.BindTaskService;
|
|
import com.cyksj.service.market.task.BindTaskService;
|
|
|
import com.cyksj.service.shop.YhShopDistributeService;
|
|
import com.cyksj.service.shop.YhShopDistributeService;
|
|
|
import com.cyksj.service.sys.SysConfigService;
|
|
import com.cyksj.service.sys.SysConfigService;
|
|
|
|
|
+import com.cyksj.service.user.BadIntentionOpService;
|
|
|
import com.cyksj.service.user.UserBindRelationService;
|
|
import com.cyksj.service.user.UserBindRelationService;
|
|
|
import com.cyksj.service.user.UserLoginRecordService;
|
|
import com.cyksj.service.user.UserLoginRecordService;
|
|
|
import com.cyksj.service.user.UserService;
|
|
import com.cyksj.service.user.UserService;
|
|
@@ -50,6 +51,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.Assert;
|
|
import org.springframework.util.Assert;
|
|
|
|
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -117,8 +119,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
|
|
|
|
|
private final UserDistributeSharedMapper userDistributeSharedMapper;
|
|
private final UserDistributeSharedMapper userDistributeSharedMapper;
|
|
|
|
|
|
|
|
- private final UserCertRecordMapper userCertRecordMapper;
|
|
|
|
|
-
|
|
|
|
|
|
|
+ private final BadIntentionOpService badIntentionOpService;
|
|
|
private static final GlobalThreadPoolTaskExecutor TASK_POOL = GlobalThreadPoolTaskExecutor.getInstance();
|
|
private static final GlobalThreadPoolTaskExecutor TASK_POOL = GlobalThreadPoolTaskExecutor.getInstance();
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -370,7 +371,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public User webLogin(LoginReq loginReq) throws Exception {
|
|
|
|
|
|
|
+ public User webLogin(LoginReq loginReq, HttpServletRequest request) throws Exception {
|
|
|
LambdaQueryWrapper<User> wrapper = Wrappers.lambdaQuery(User.class).last("limit 1");
|
|
LambdaQueryWrapper<User> wrapper = Wrappers.lambdaQuery(User.class).last("limit 1");
|
|
|
if (loginReq.getType() == null || loginReq.getType() < 1 || loginReq.getType() > 3) {
|
|
if (loginReq.getType() == null || loginReq.getType() < 1 || loginReq.getType() > 3) {
|
|
|
throw BusinessRuntimeException.getInstance("系统异常,请刷新页面重新操作");
|
|
throw BusinessRuntimeException.getInstance("系统异常,请刷新页面重新操作");
|
|
@@ -391,6 +392,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
throw BusinessRuntimeException.getInstance("手机验证码已失效,请重新获取");
|
|
throw BusinessRuntimeException.getInstance("手机验证码已失效,请重新获取");
|
|
|
}
|
|
}
|
|
|
if (!StrUtil.equals(loginReq.getCode(), phoneCode.getCode())) {
|
|
if (!StrUtil.equals(loginReq.getCode(), phoneCode.getCode())) {
|
|
|
|
|
+ //是否是恶意用户
|
|
|
|
|
+ badIntentionOpService.isBadOpLoginPhone(request, loginReq.getPhone());
|
|
|
throw BusinessRuntimeException.getInstance("手机验证码错误,请重新输入");
|
|
throw BusinessRuntimeException.getInstance("手机验证码错误,请重新输入");
|
|
|
}
|
|
}
|
|
|
wrapper.eq(User::getLoginPhone, loginReq.getPhone());
|
|
wrapper.eq(User::getLoginPhone, loginReq.getPhone());
|
|
@@ -409,7 +412,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
redisService.del(RedisService.key.EMAIL_CODE_KEY.getNameFormat(loginReq.getEmail()));
|
|
redisService.del(RedisService.key.EMAIL_CODE_KEY.getNameFormat(loginReq.getEmail()));
|
|
|
wrapper.eq(User::getEmail, loginReq.getEmail());
|
|
wrapper.eq(User::getEmail, loginReq.getEmail());
|
|
|
}
|
|
}
|
|
|
- if (loginReq.getType() == 3){
|
|
|
|
|
|
|
+ if (loginReq.getType() == 3) {
|
|
|
wrapper.eq(User::getEmail, loginReq.getEmail());
|
|
wrapper.eq(User::getEmail, loginReq.getEmail());
|
|
|
}
|
|
}
|
|
|
//保存用户信息
|
|
//保存用户信息
|