lyhzzz 1 天之前
父節點
當前提交
7361fbbe6a

+ 1 - 1
src/main/java/com/fdkankan/ucenter/util/MyExcelUtil.java

@@ -36,7 +36,7 @@ public class MyExcelUtil {
 
     //根据模板导出excel
     public static String excelTemplteToPdf(String localPath, String templateName, Object obj) {
-        String fileName = templateName + UUID.randomUUID().toString().replace("-","") + ".xlsx";
+        String fileName =  UUID.randomUUID().toString().replaceAll("-","") + ".xlsx";
 
         InputStream inputStream = MyExcelUtil.class.getClassLoader().getResourceAsStream("template/"+templateName+ ".xlsx");
 

+ 9 - 9
src/main/java/com/fdkankan/ucenter/util/SendMailUtils.java

@@ -8,6 +8,7 @@ import javax.activation.DataSource;
 import javax.activation.FileDataSource;
 import javax.mail.*;
 import javax.mail.internet.*;
+import java.io.File;
 import java.util.Properties;
 
 /**
@@ -65,15 +66,14 @@ public class SendMailUtils {
             MimeMultipart multipart = new MimeMultipart("mixed");
 
             if(StringUtils.isNotEmpty(filename)){
-                // 附件部分
-                messageBodyPart = new MimeBodyPart();
-                // 设置要发送附件的文件路径
-                DataSource source = new FileDataSource(filename);
-                messageBodyPart.setDataHandler(new DataHandler(source));
-                // messageBodyPart.setFileName(filename);
-                // 处理附件名称中文(附带文件路径)乱码问题
-                messageBodyPart.setFileName(MimeUtility.encodeText(filename));
-                multipart.addBodyPart(messageBodyPart);
+                File file = new File(filename);
+                if(file.exists()){
+                    messageBodyPart = new MimeBodyPart();
+                    DataSource source = new FileDataSource(filename);
+                    messageBodyPart.setDataHandler(new DataHandler(source));
+                    messageBodyPart.setFileName(MimeUtility.encodeText(file.getName(), "UTF-8", "B"));
+                    multipart.addBodyPart(messageBodyPart);
+                }
             }
             //html代码部分
             MimeBodyPart htmlPart = new MimeBodyPart();