营销计划关联发件箱逻辑和是否拒收逻辑

storlead-framework/storlead-common/src/main/java/com/storlead/framework/common/properties/UrlChainDefinitionPorperties.java

@@ -73,6 +73,8 @@ public class UrlChainDefinitionPorperties {
 			"/sys/menu/update_menu_icon",
 			"/mail/file/images",
 			"/mail/file/cache_image_file",
+//            "/mkt/file/cache_image_file",
+//            "/mkt/file/cache_mail_file",
 			"/mail/import_mail_eml",
 			"/mail/import_mail_eml_zip",
 			"/sys/test/receive_mail_test",

storlead-mail-api/src/main/java/com/storlead/mail/crm/MaiAttachmentApiController.java

@@ -105,7 +105,7 @@ public class MaiAttachmentApiController {
             jsonObject.put("id", tempAttachment.getId());
             jsonObject.put("fileName", fileName);
             jsonObject.put("uploaded", 1);
-            jsonObject.put("url", "/sales/mail/file/images/"+fileName);
+            jsonObject.put("url", "/router/rest/mail/file/images/"+fileName);
             return jsonObject;
         } catch (Exception e) {
             log.error("--upload -- error =", e);

storlead-mail-api/src/main/resources/application-dev.yml

@@ -157,12 +157,12 @@ file:
     path: ~/file/
     avatar: ~/avatar/
   linux:
-    path: /mnt/vdb/email/file/email/attachments/
-    avatar: /mnt/vdb/email/file/avatar/
-    jpeg: /mnt/vdb/email/file/email/image/
+    path: /app/files/
+    avatar: /app/files/avatar/
   windows:
-    path: D:\images\file\
-    avatar: D:\images\
+    path: D:\mail\attachment\
+    avatar: D:\mail\
+    jpeg: D:\mail\image\
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5

storlead-mail/storlead-mail-common/src/main/java/com/storlead/sales/mail/common/util/EmailHelper.java

@@ -66,7 +66,7 @@ public class EmailHelper {
                 img.attr("src", "cid:" + cid);  // 将 src 转换为 cid:imageX 格式
                 // 将图片路径和生成的 CID 映射保存
                 String downloadDir = filePath;
-                String imageName = src.replace("/sales/mail/file/images/","/");
+                String imageName = src.replace("/router/rest/mail/file/images/","/");
                 String url = downloadDir + imageName;
                 imagePathMap.put(cid, new File(url));
             }
@@ -144,13 +144,13 @@ public class EmailHelper {
                     MimeBodyPart imagePart = createImagePartFromURL(src,cid);
                     multipart.addBodyPart(imagePart);
 
-                } else if (src.contains("/sales/mail/file/images/")){
+                } else if (src.contains("/router/rest/mail/file/images/")){
                     if (src != null && !src.isEmpty()) {
                         // 根据图片的 URL 为每个图片生成唯一的 CID
                         img.attr("src", "cid:" + cid);  // 将 src 转换为 cid:imageX 格式
                     }
                     String downloadDir = filePath;
-                    String imageName = src.replace("/sales/mail/file/images/", "");
+                    String imageName = src.replace("/router/rest/mail/file/images/", "");
                     String imagePath = downloadDir + imageName;
                     MimeBodyPart imagePart = new MimeBodyPart();
                     DataSource source = new FileDataSource(imagePath);
@@ -192,7 +192,7 @@ public class EmailHelper {
         // 遍历所有 img 标签
         for (Element img : doc.select("img")) {
             String src = img.attr("src");  // 获取 src 属性（图片 URL）
-            String imageName = src.replace("/sales/mail/file/images/", "");
+            String imageName = src.replace("/router/rest/mail/file/images/", "");
             String imgSrc = downloadDir + imageName;
             String base64Image = convertImageToFileBase64(imgSrc);
             String imageExtension = imgSrc.substring(imgSrc.lastIndexOf('.') + 1);