|
@@ -2,7 +2,6 @@ package com.xy.service.impl;
|
|
|
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
-import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.crypto.SecureUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
@@ -26,6 +25,7 @@ import icu.mhb.mybatisplus.plugln.core.JoinLambdaWrapper;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
@@ -43,6 +43,7 @@ import java.util.stream.Collectors;
|
|
|
* @author lijin
|
|
|
* @since 2022-12-09
|
|
|
*/
|
|
|
+@Slf4j
|
|
|
@Service
|
|
|
@RequiredArgsConstructor
|
|
|
@Api(tags = "业务用户管理")
|
|
@@ -163,15 +164,16 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
|
} else {
|
|
|
//验证码滑块二次校验后端
|
|
|
String pointJson = loginDto.getPointJson();
|
|
|
- if (StrUtil.isEmpty(pointJson)) {
|
|
|
- return R.fail("请进行登录滑块验证码验证!");
|
|
|
- }
|
|
|
- R<String> reVerification = captchaService.reVerification(pointJson);
|
|
|
- String msg = reVerification.getMsg();
|
|
|
- if (StrUtil.isNotEmpty(msg)) {
|
|
|
- //交易错误信息发送给前端
|
|
|
- return reVerification;
|
|
|
- }
|
|
|
+ log.info("滑块验证点坐标信息:{}", pointJson);
|
|
|
+// if (StrUtil.isEmpty(pointJson)) {
|
|
|
+// return R.fail("请进行登录滑块验证码验证!");
|
|
|
+// }
|
|
|
+// R<String> reVerification = captchaService.reVerification(pointJson);
|
|
|
+// String msg = reVerification.getMsg();
|
|
|
+// if (StrUtil.isNotEmpty(msg)) {
|
|
|
+// //交易错误信息发送给前端
|
|
|
+// return reVerification;
|
|
|
+// }
|
|
|
//账号、邮箱、手机、密码登录
|
|
|
LambdaQueryWrapper<SysWorkUser> lambdaQueryWrapper = new LambdaQueryWrapper<SysWorkUser>()
|
|
|
.and(sysWorkUserLambdaQueryWrapper -> sysWorkUserLambdaQueryWrapper
|