This commit is contained in:
tangzh 2025-06-07 15:47:49 +08:00
parent fc94f8f625
commit d5c3d62d95
4 changed files with 14 additions and 26 deletions

View File

@ -3,6 +3,7 @@ package me.zhengjie.modules.front.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSONObject;
import me.zhengjie.config.properties.FileProperties;
import me.zhengjie.exception.BadRequestException;
import me.zhengjie.modules.front.domain.dto.LoginVo;
import me.zhengjie.modules.front.domain.dto.WeChatMiniAuthorizeVo;
@ -14,7 +15,6 @@ import me.zhengjie.modules.security.service.dto.JwtUserDto;
import me.zhengjie.modules.system.domain.BusUser;
import me.zhengjie.modules.system.mapper.BusUserMapper;
import me.zhengjie.modules.system.service.BusUserService;
import me.zhengjie.service.LocalStorageService;
import me.zhengjie.utils.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Random;
@ -44,16 +45,22 @@ public class WeChatServiceImpl implements WeChatService {
@Autowired private RestTemplateUtils restTemplateUtil;
@Autowired private TokenProvider tokenProvider;
@Autowired private SecurityProperties properties;
@Autowired private FileProperties fileProperties;
@Autowired private OnlineUserService onlineUserService;
@Autowired private BusUserService busUserService;
@Autowired private LocalStorageService localStorageService;
private static final String DEFAULT_AVATAR = "/avatar/avatar.png";
private static final String WECHAT_MINI_SNS_AUTH_CODE2SESSION_URL = "https://api.weixin.qq.com/sns/jscode2session?appid={}&secret={}&js_code={}&grant_type=authorization_code";
@Override
public String getQrCode(Long deviceId, String code) {
MultipartFile mFile = qrCodeUtil.getQrCode(code, code);
return localStorageService.createFile(code, mFile);
MultipartFile multipartFile = qrCodeUtil.getQrCode(code, code);
String suffix = FileUtil.getExtensionName(multipartFile.getOriginalFilename());
String type = FileUtil.getFileType(suffix);
File file = FileUtil.upload(multipartFile, fileProperties.getPath().getPath() + type + File.separator);
if(ObjectUtil.isNull(file)){
throw new BadRequestException("上传失败");
}
return file.getName();
}
@Override

View File

@ -18,8 +18,6 @@ package me.zhengjie.modules.system.rest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import me.zhengjie.domain.dto.EmailDto;
import me.zhengjie.service.EmailService;
import me.zhengjie.modules.system.service.VerifyService;
import me.zhengjie.utils.enums.CodeBiEnum;
import me.zhengjie.utils.enums.CodeEnum;
@ -39,23 +37,6 @@ import java.util.Objects;
public class VerifyController {
private final VerifyService verificationCodeService;
private final EmailService emailService;
@PostMapping(value = "/resetEmail")
@ApiOperation("重置邮箱,发送验证码")
public ResponseEntity<Object> resetEmail(@RequestParam String email){
EmailDto emailDto = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey());
emailService.send(emailDto,emailService.find());
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping(value = "/email/resetPass")
@ApiOperation("重置密码,发送验证码")
public ResponseEntity<Object> resetPass(@RequestParam String email){
EmailDto emailDto = verificationCodeService.sendEmail(email, CodeEnum.EMAIL_RESET_PWD_CODE.getKey());
emailService.send(emailDto,emailService.find());
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping(value = "/validated")
@ApiOperation("验证码验证")

View File

@ -1,7 +1,7 @@
package me.zhengjie.modules.system.service.impl;//package me.zhengjie.modules.system.service.webstocket;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import lombok.extern.slf4j.Slf4j;
import me.zhengjie.modules.security.config.WebSocketConfig;
import me.zhengjie.modules.security.config.enums.*;

View File

@ -1,6 +1,6 @@
package me.zhengjie.modules.system.service.impl;//package me.zhengjie.modules.system.service.webstocket;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSON;
import lombok.extern.slf4j.Slf4j;
import me.zhengjie.modules.security.config.WebSocketConfig;
import me.zhengjie.modules.security.config.enums.CapabilitieEnum;