|
@@ -2,7 +2,6 @@ package com.xy.service.impl;
|
|
|
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
-import cn.hutool.core.util.StrUtil;
|
|
|
|
import cn.hutool.crypto.SecureUtil;
|
|
import cn.hutool.crypto.SecureUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
@@ -166,15 +165,15 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
|
|
//验证码滑块二次校验后端
|
|
//验证码滑块二次校验后端
|
|
String pointJson = loginDto.getPointJson();
|
|
String pointJson = loginDto.getPointJson();
|
|
log.info("滑块验证点坐标信息:{}", pointJson);
|
|
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;
|
|
|
|
- }
|
|
|
|
|
|
+// 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>()
|
|
LambdaQueryWrapper<SysWorkUser> lambdaQueryWrapper = new LambdaQueryWrapper<SysWorkUser>()
|
|
.and(sysWorkUserLambdaQueryWrapper -> sysWorkUserLambdaQueryWrapper
|
|
.and(sysWorkUserLambdaQueryWrapper -> sysWorkUserLambdaQueryWrapper
|