diff --git a/pom.xml b/pom.xml index e167392..0030b5c 100644 --- a/pom.xml +++ b/pom.xml @@ -186,6 +186,14 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + diff --git a/src/main/java/com/jwl/driver/server/dto/LoginUserDto.java b/src/main/java/com/jwl/driver/server/dto/LoginUserDto.java index 6ff1aeb..a940df4 100644 --- a/src/main/java/com/jwl/driver/server/dto/LoginUserDto.java +++ b/src/main/java/com/jwl/driver/server/dto/LoginUserDto.java @@ -22,4 +22,7 @@ public class LoginUserDto { @ApiModelProperty(value = "登陆验证码",required = true) @NotBlank(message = "登陆验证码不能为空") private String code; + + @ApiModelProperty(value = "来源") + private String id; } diff --git a/src/main/java/com/jwl/driver/server/service/impl/TdSysUserServiceImpl.java b/src/main/java/com/jwl/driver/server/service/impl/TdSysUserServiceImpl.java index 017c310..9de101a 100644 --- a/src/main/java/com/jwl/driver/server/service/impl/TdSysUserServiceImpl.java +++ b/src/main/java/com/jwl/driver/server/service/impl/TdSysUserServiceImpl.java @@ -2,6 +2,7 @@ package com.jwl.driver.server.service.impl; import cn.hutool.core.util.PhoneUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jwl.driver.server.constant.Constants; import com.jwl.driver.server.dto.DriverSchoolDto; @@ -13,11 +14,9 @@ import com.jwl.driver.server.mapper.TdSysUserMapper; import com.jwl.driver.server.redis.RedisCache; import com.jwl.driver.server.service.ITdSysUserService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jwl.driver.server.util.DateTimeUtil; -import com.jwl.driver.server.util.SecurityUtil; -import com.jwl.driver.server.util.SmsUtil; -import com.jwl.driver.server.util.TokenThreadUtil; +import com.jwl.driver.server.util.*; import com.jwl.driver.server.vo.LoginUserVo; +import com.jwl.driver.server.vo.SchoolVO; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -88,11 +87,25 @@ public class TdSysUserServiceImpl extends ServiceImpl