|
@@ -5,11 +5,8 @@ import cn.hutool.captcha.CaptchaUtil;
|
|
|
import cn.hutool.captcha.CircleCaptcha;
|
|
|
import cn.hutool.core.img.ImgUtil;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
-import cn.hutool.crypto.SecureUtil;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.example.xiaoshiweixinback.business.common.Response;
|
|
|
-import com.example.xiaoshiweixinback.business.common.base.RedisConf;
|
|
|
import com.example.xiaoshiweixinback.business.common.log.LogHelper;
|
|
|
import com.example.xiaoshiweixinback.business.exception.BusinessException;
|
|
|
import com.example.xiaoshiweixinback.business.exception.ExceptionEnum;
|
|
@@ -22,11 +19,13 @@ import com.example.xiaoshiweixinback.entity.dto.person.*;
|
|
|
import com.example.xiaoshiweixinback.entity.vo.person.Jscode2SessionWo;
|
|
|
import com.example.xiaoshiweixinback.entity.vo.person.LoginByWxVO;
|
|
|
import com.example.xiaoshiweixinback.entity.vo.person.LoginVO;
|
|
|
+import com.example.xiaoshiweixinback.entity.vo.person.PersonVO;
|
|
|
import com.example.xiaoshiweixinback.mapper.PersonMapper;
|
|
|
import com.example.xiaoshiweixinback.okhttp.RequestManager;
|
|
|
import com.example.xiaoshiweixinback.okhttp.ResponseManager;
|
|
|
import org.apache.commons.codec.binary.Base64;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.core.env.Environment;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Propagation;
|
|
@@ -228,10 +227,17 @@ public class LoginService {
|
|
|
result.put("captcha", ImgUtil.toBase64DataUri(captcha.getImage(), "png"));
|
|
|
result.put("uuid", uuid);
|
|
|
//4.将验证码存放到Redis里面并设置过期时间为 60 单位:秒 KEY值格式为: 验证码:UUID VALUE值为:验证码生成工具所生成的验证码
|
|
|
- redisUtil.setEx(AppCacheKeyUtil.getCheckCode(vo.getPhoneNum()), captcha.getCode(), 60, TimeUnit.SECONDS);
|
|
|
+// redisUtil.setEx(AppCacheKeyUtil.getCheckCode(vo.getPhoneNum()), captcha.getCode(), 60, TimeUnit.SECONDS);
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ public PersonVO selectPerson(PersonIdDTO vo) {
|
|
|
+ Person person = personMapper.selectById(vo.getId());
|
|
|
+ PersonVO personVO = new PersonVO();
|
|
|
+ BeanUtil.copy(person, personVO);
|
|
|
+ return personVO;
|
|
|
+ }
|
|
|
+
|
|
|
@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Throwable.class)
|
|
|
public boolean editPerson(EditPersonDTO vo) {
|
|
|
if (!RegexUtil.isPhoneLegal(vo.getPhoneNum())) {
|