Browse Source

Bug修复

tangxiangan 3 months ago
parent
commit
48951ec53d

+ 2 - 1
pdf-office-email/src/main/java/cn/kdan/cloud/pdf/office/email/rabbit/listener/SendEmailListener.java

@@ -22,6 +22,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 
+import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import java.io.File;
 import java.net.URL;
@@ -84,7 +85,7 @@ import java.util.Objects;
             helper.setTo(emailSendBO.getToEmail());
             helper.setFrom(ObjectUtils.isEmpty(emailSendBO.getFromEmail())
                     ? Objects.requireNonNull(mailSender.getUsername())
-                    : emailSendBO.getFromEmail());
+                    : emailSendBO.getFromEmail(), "PDF Reader Pro");
             if(ObjectUtils.isNotEmpty(emailSendBO.getFileUrl())){
                 file = new File(emailSendBO.getFileName());
                 FileUtils.copyURLToFile(new URL(emailSendBO.getFileUrl()), file);

+ 2 - 0
pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/AppStoreServiceImpl.java

@@ -184,6 +184,7 @@ public class AppStoreServiceImpl implements AppStoreService {
             bo.setSendContent(contentMap);
             String file = sendInvoice(userVO.getEmail(),formattedDate,orderManualDTO.getTradeNo(),orderManualDTO.getInvoiceNo(),renewPrice,orderManualDTO.getPrice());
             bo.setFileUrl(file);
+            bo.setFileName("invoice.pdf");
             emailApi.sendEmail(bo);
         }else{
             EmailSendBO bo = new EmailSendBO();
@@ -216,6 +217,7 @@ public class AppStoreServiceImpl implements AppStoreService {
             bo.setSendContent(contentMap);
             String file = sendInvoice(userVO.getEmail(),formattedDate,orderManualDTO.getTradeNo(),orderManualDTO.getInvoiceNo(),renewPrice,orderManualDTO.getPrice());
             bo.setFileUrl(file);
+            bo.setFileName("invoice.pdf");
             emailApi.sendEmail(bo);
         }
     }

+ 2 - 0
pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/GooglePayServiceImpl.java

@@ -197,6 +197,7 @@ public class GooglePayServiceImpl implements GooglePayService {
             bo.setSendContent(contentMap);
             String file = sendInvoice(userVO.getEmail(),formattedDate,orderManualDTO.getTradeNo(),orderManualDTO.getInvoiceNo(),renewPrice,orderManualDTO.getPrice());
             bo.setFileUrl(file);
+            bo.setFileName("invoice.pdf");
             emailApi.sendEmail(bo);
         }else{
             EmailSendBO bo = new EmailSendBO();
@@ -229,6 +230,7 @@ public class GooglePayServiceImpl implements GooglePayService {
             bo.setSendContent(contentMap);
             String file = sendInvoice(userVO.getEmail(),formattedDate,orderManualDTO.getTradeNo(),orderManualDTO.getInvoiceNo(),renewPrice,orderManualDTO.getPrice());
             bo.setFileUrl(file);
+            bo.setFileName("invoice.pdf");
             emailApi.sendEmail(bo);
         }
     }