Merge remote-tracking branch 'origin/master'

authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -163,17 +163,21 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
             }
             sysWorkUser = getOne(new LambdaQueryWrapper<SysWorkUser>().eq(SysWorkUser::getPhone, loginDto.getLoginName()));
         } else {
-            //验证码滑块二次校验后端
-            String pointJson = loginDto.getPointJson();
-            log.info("滑块验证点坐标信息：{}", pointJson);
-            if (StrUtil.isEmpty(pointJson)) {
-                return R.fail("请进行登录滑块验证码验证！");
-            }
-            R<String> reVerification = captchaService.reVerification(pointJson);
-            String msg = reVerification.getMsg();
-            if (200 != reVerification.getCode() && StrUtil.isNotEmpty(msg)) {
-                //交易错误信息发送给前端
-                return reVerification;
+            String clientType = loginDto.getClientType();
+            //TODO 暂定类型1需要滑块验证码，这里后续定义好类型了需要改为枚举
+            if ("1".equals(clientType)) {
+                //验证码滑块二次校验后端
+                String pointJson = loginDto.getPointJson();
+                log.info("滑块验证点坐标信息：{}", pointJson);
+                if (StrUtil.isEmpty(pointJson)) {
+                    return R.fail("请进行登录滑块验证码验证！");
+                }
+                R<String> reVerification = captchaService.reVerification(pointJson);
+                String msg = reVerification.getMsg();
+                if (200 != reVerification.getCode() && StrUtil.isNotEmpty(msg)) {
+                    //交易错误信息发送给前端
+                    return reVerification;
+                }
             }
             //账号、邮箱、手机、密码登录
             LambdaQueryWrapper<SysWorkUser> lambdaQueryWrapper = new LambdaQueryWrapper<SysWorkUser>()