登录新增参数
parent
df4345f34c
commit
74d8f55541
8
pom.xml
8
pom.xml
|
@ -186,6 +186,14 @@
|
|||
</excludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<testFailureIgnore>true</testFailureIgnore>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
|
|
@ -22,4 +22,7 @@ public class LoginUserDto {
|
|||
@ApiModelProperty(value = "登陆验证码",required = true)
|
||||
@NotBlank(message = "登陆验证码不能为空")
|
||||
private String code;
|
||||
|
||||
@ApiModelProperty(value = "来源")
|
||||
private String id;
|
||||
}
|
||||
|
|
|
@ -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<TdSysUserMapper, TdSysUser
|
|||
TdSysUser tdSysUser = this.baseMapper.selectOne(cond);
|
||||
//todo 用户基础信息填写这里还要完善一下
|
||||
if (tdSysUser == null) {
|
||||
|
||||
tdSysUser = new TdSysUser()
|
||||
.setUserName("车友")
|
||||
.setAvatar("")
|
||||
.setPhone(loginUserDto.getPhone())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
|
||||
//根据id查询驾校信息
|
||||
if(!StringUtil.isNullOrEmpty(loginUserDto.getId())){
|
||||
String result = HttpUtils.sendGet("https://xueche.ahduima.com/duima/applet/school/"+loginUserDto.getId());
|
||||
JSONObject jsonObject = JSONObject.parseObject(result);
|
||||
if(jsonObject.get("data") != null){
|
||||
SchoolVO schoolVO = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("data")), SchoolVO.class);
|
||||
tdSysUser.setSchoolId(schoolVO.getSchoolId())
|
||||
.setSchoolName(schoolVO.getSchoolName())
|
||||
.setSchoolPhone(schoolVO.getPhone());
|
||||
}
|
||||
}
|
||||
|
||||
int insert = this.getBaseMapper().insert(tdSysUser);
|
||||
if (insert != 1) {
|
||||
throw new BusinessException("用户注册异常");
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
package com.jwl.driver.server.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class SchoolVO {
|
||||
private Long schoolId;
|
||||
|
||||
/** 驾校名称 */
|
||||
private String schoolName;
|
||||
|
||||
/** 负责人 */
|
||||
private String leader;
|
||||
|
||||
/** 联系电话 */
|
||||
private String phone;
|
||||
|
||||
/** 部门状态(0正常 1停用) */
|
||||
private String status;
|
||||
}
|
|
@ -15,13 +15,13 @@ spring:
|
|||
# 数据库 配置
|
||||
datasource:
|
||||
# 本地
|
||||
url: jdbc:mysql://127.0.0.1:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai
|
||||
username: root
|
||||
password: 123456
|
||||
# 测试库
|
||||
# url: jdbc:mysql://118.31.23.45:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai
|
||||
# url: jdbc:mysql://127.0.0.1:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai
|
||||
# username: root
|
||||
# password: admin231280
|
||||
# password: 123456
|
||||
# 测试库
|
||||
url: jdbc:mysql://118.31.23.45:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai
|
||||
username: root
|
||||
password: admin231280
|
||||
# 生产库
|
||||
# url: jdbc:mysql://114.55.169.15:3306/driver_server?characterEncoding=utf-8&autoReconnect=true&maxReconnects=2&useSSL=false&allowPublicKeyRetrieval=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai
|
||||
# username: root
|
||||
|
|
|
@ -7,7 +7,7 @@ spring:
|
|||
application:
|
||||
name: '@artifactId@'
|
||||
profiles:
|
||||
active: prod
|
||||
active: test
|
||||
#mybatis
|
||||
mybatis-plus:
|
||||
mapper-locations: classpath*:/mapper/**Mapper.xml
|
||||
|
|
Loading…
Reference in New Issue