Browse Source

邮件发送文件类型处理

liyuan 6 months ago
parent
commit
88bc45f204

+ 5 - 1
blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -6738,6 +6738,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 
 	@Override
 	public R<String> generateMailFileAndSend(GenerateMailVo generateMailVo) {
+		String sendMailType = sysClient.getParamService("send.mail.type");
+		if (!StringUtils.hasText(sendMailType)) {
+			return R.fail("请配置邮件发送方式");
+		}
 		String baseFilePath = sysClient.getParamService("stimulsoft.send.mail.path");
 		if (!StringUtils.hasText(baseFilePath)) {
 			return R.fail("请配置发送邮件文件路径");
@@ -6794,7 +6798,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 		mailDto.setMailFrom(userMail);
 		mailDto.setMailUserName(userMail);
 		mailDto.setMailPassword(userMailAuthorization);
-		mailDto.setMailType(MailTypeEnum.QQ.mailType);
+		mailDto.setMailType(Integer.parseInt(sendMailType));
 		mailDto.setMailTo(generateMailVo.getSendTo());
 		mailDto.setMailCc(generateMailVo.getSendCc());
 		mailDto.setMailBcc(generateMailVo.getSendBcc());