push

yd-email-api/src/main/java/com/yd/email/api/service/impl/ApiEmailServiceImpl.java

@@ -134,7 +134,7 @@ public class ApiEmailServiceImpl implements ApiEmailService {
             Multipart multipart = new MimeMultipart();
             Multipart multipart = new MimeMultipart();
             multipart.addBodyPart(messageBodyPart);
             multipart.addBodyPart(messageBodyPart);
 
 
-            // 多附件处理逻辑（您之前添加的）
+            // 修改附件处理部分：
             if (StringUtils.isNotBlank(dto.getAttachmentPath())) {
             if (StringUtils.isNotBlank(dto.getAttachmentPath())) {
                 String[] attachmentPaths = dto.getAttachmentPath().split(";");
                 String[] attachmentPaths = dto.getAttachmentPath().split(";");
                 for (String attachmentPath : attachmentPaths) {
                 for (String attachmentPath : attachmentPaths) {
@@ -142,13 +142,27 @@ public class ApiEmailServiceImpl implements ApiEmailService {
                     if (StringUtils.isNotBlank(attachmentPath)) {
                     if (StringUtils.isNotBlank(attachmentPath)) {
                         try {
                         try {
                             MimeBodyPart attachmentPart = new MimeBodyPart();
                             MimeBodyPart attachmentPart = new MimeBodyPart();
-                            DataSource source = new FileDataSource(attachmentPath);
+                            DataSource source;
+                            String fileName;
+
+                            if (attachmentPath.startsWith("http://") || attachmentPath.startsWith("https://")) {
+                                // 使用URLDataSource处理网络附件
+                                URL url = new URL(attachmentPath);
+                                source = new URLDataSource(url);
+                                fileName = getFileNameFromUrl(attachmentPath);
+                            } else {
+                                // 处理本地文件附件
+                                source = new FileDataSource(attachmentPath);
+                                fileName = new File(attachmentPath).getName();
+                            }
+
                             attachmentPart.setDataHandler(new DataHandler(source));
                             attachmentPart.setDataHandler(new DataHandler(source));
-                            attachmentPart.setFileName(new File(attachmentPath).getName());
+                            attachmentPart.setFileName(fileName);
                             multipart.addBodyPart(attachmentPart);
                             multipart.addBodyPart(attachmentPart);
-                            log.info("成功添加附件: {}", attachmentPath);
+                            log.info("添加附件: {}", attachmentPath);
                         } catch (Exception e) {
                         } catch (Exception e) {
                             log.error("添加附件失败: {}", attachmentPath, e);
                             log.error("添加附件失败: {}", attachmentPath, e);
+                            throw new RuntimeException("添加附件失败: " + attachmentPath, e);
                         }
                         }
                     }
                     }
                 }
                 }