|
@@ -56,7 +56,11 @@ public class LoginService {
|
|
|
@Autowired
|
|
|
private PersonMapper personMapper;
|
|
|
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 手机号/账号登录
|
|
|
+ * @param dto
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
|
|
|
public LoginVO loginByPhone(LoginDTO dto) {
|
|
|
LogHelper.log("登录开始");
|
|
@@ -190,6 +194,11 @@ public class LoginService {
|
|
|
return wxVO;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 发送验证码
|
|
|
+ * @param vo
|
|
|
+ * @return
|
|
|
+ */
|
|
|
public boolean sendCode(SendCodeDTO vo) {
|
|
|
boolean flag = false;
|
|
|
if (!RegexUtil.isPhoneLegal(vo.getPhoneNum())) {
|
|
@@ -204,7 +213,7 @@ public class LoginService {
|
|
|
redisService.delete(AppCacheKeyUtil.getCheckCode(vo.getPhoneNum()));
|
|
|
//生成验证码
|
|
|
String random = RandomUtil.getSixRandom();
|
|
|
- //手机号和验证码放进缓存 设置过期时间5m
|
|
|
+ //手机号和验证码放进缓存 设置过期时间5min
|
|
|
redisService. set(AppCacheKeyUtil.getLoginMessageCode(vo.getPhoneNum()), random);
|
|
|
redisService.expire(AppCacheKeyUtil.getLoginMessageCode(vo.getPhoneNum()), CacheTTLEnum.FIVE_MINUTE);
|
|
|
//发送短信
|
|
@@ -237,6 +246,11 @@ public class LoginService {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 查询个人信息
|
|
|
+ * @param vo
|
|
|
+ * @return
|
|
|
+ */
|
|
|
public PersonVO selectPerson(PersonIdDTO vo) {
|
|
|
Person person = personMapper.selectById(vo.getId());
|
|
|
PersonVO personVO = new PersonVO();
|
|
@@ -244,6 +258,11 @@ public class LoginService {
|
|
|
return personVO;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 修改个人信息
|
|
|
+ * @param vo
|
|
|
+ * @return
|
|
|
+ */
|
|
|
@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Throwable.class)
|
|
|
public boolean editPerson(EditPersonDTO vo) {
|
|
|
if (!RegexUtil.isPhoneLegal(vo.getPhoneNum())) {
|
|
@@ -260,13 +279,6 @@ public class LoginService {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
- public String getToken() {
|
|
|
- String uuid = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
- com.bjbz.common.jwt.JwtUserInfo jwtUserInfo = new com.bjbz.common.jwt.JwtUserInfo();
|
|
|
- jwtUserInfo.setToken(uuid);
|
|
|
- return jwtTokenUtil.generateToken(jwtUserInfo.toJsonString(), jwtTokenUtil.getRandomKey());
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 退出登录
|
|
|
*
|
|
@@ -284,6 +296,13 @@ public class LoginService {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
+ public String getToken() {
|
|
|
+ String uuid = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
+ com.bjbz.common.jwt.JwtUserInfo jwtUserInfo = new com.bjbz.common.jwt.JwtUserInfo();
|
|
|
+ jwtUserInfo.setToken(uuid);
|
|
|
+ return jwtTokenUtil.generateToken(jwtUserInfo.toJsonString(), jwtTokenUtil.getRandomKey());
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 解密用户数据
|
|
|
*
|