push

yd-email-api/src/main/java/com/yd/email/api/async/ApiEmailSendAsyncService.java

@@ -102,18 +102,30 @@ public class ApiEmailSendAsyncService {
                     apiSendMailDto.setReceiveEmail(recipient.getReceiveEmail());
                     //抄送人邮箱列表
                     apiSendMailDto.setCcEmailList(ccEmailList);
+
                     //邮件内容
                     if (StringUtil.hasPlaceholdersSimple(emailTask.getContent())
                             && StringUtils.isNotBlank(emailTask.getVariableGroupBizId())) {
                         //检测内容是否有占位符，有占位符并且变量分组唯一业务ID不为空就替换具体内容,替换具体内容：recipient.getVariables()
-                        apiSendMailDto.setContent(StringUtil.replacePlaceholders(emailTask.getContent(),
-                                recipient.getVariables()));
+                        //非通用变量替换内容
+                        String content = StringUtil.replacePlaceholders(emailTask.getContent(),
+                                recipient.getVariables());
+                        //通用变量替换内容
+                        //检测内容是否含有通用变量
+                        if (StringUtil.hasTyVariables(emailTask.getContent())) {
+                            content = apiEmailContactService.replacePlaceholders(content,recipient.getContactBizId());
+                        }
+                        apiSendMailDto.setContent(content);
                     }else if (StringUtil.hasPlaceholdersSimple(emailTask.getContent())
                             && StringUtils.isBlank(emailTask.getVariableGroupBizId())) {
                         //检测内容是否有占位符，有占位符并且变量分组唯一业务ID为空就替换具体内容。替换具体内容：通用变量字段：收件人姓名、收件人称谓、公司，这三个字段内容从收件人联系人获取
-                        apiSendMailDto.setContent(apiEmailContactService.replacePlaceholders(emailTask.getContent(),recipient.getContactBizId()));
-
+                        //检测内容是否含有通用变量
+                        if (StringUtil.hasTyVariables(emailTask.getContent())) {
+                            String content = apiEmailContactService.replacePlaceholders(emailTask.getContent(),recipient.getContactBizId());
+                            apiSendMailDto.setContent(content);
                         }
+                    }
+
                     // 调用邮件服务发送邮件
                     apiEmailService.sendMail(apiSendMailDto);
 

yd-email-api/src/main/java/com/yd/email/api/handler/EmailSendJobHandler.java

@@ -112,17 +112,30 @@ public class EmailSendJobHandler {
                     apiSendMailDto.setReceiveEmail(recipient.getReceiveEmail());
                     //抄送人邮箱列表
                     apiSendMailDto.setCcEmailList(ccEmailList);
+
                     //邮件内容
                     if (StringUtil.hasPlaceholdersSimple(emailTask.getContent())
                             && StringUtils.isNotBlank(emailTask.getVariableGroupBizId())) {
                         //检测内容是否有占位符，有占位符并且变量分组唯一业务ID不为空就替换具体内容,替换具体内容：recipient.getVariables()
-                        apiSendMailDto.setContent(StringUtil.replacePlaceholders(emailTask.getContent(),
-                                recipient.getVariables()));
+                        //非通用变量替换内容
+                        String content = StringUtil.replacePlaceholders(emailTask.getContent(),
+                                recipient.getVariables());
+                        //通用变量替换内容
+                        //检测内容是否含有通用变量
+                        if (StringUtil.hasTyVariables(emailTask.getContent())) {
+                            content = apiEmailContactService.replacePlaceholders(content,recipient.getContactBizId());
+                        }
+                        apiSendMailDto.setContent(content);
                     }else if (StringUtil.hasPlaceholdersSimple(emailTask.getContent())
                             && StringUtils.isBlank(emailTask.getVariableGroupBizId())) {
                         //检测内容是否有占位符，有占位符并且变量分组唯一业务ID为空就替换具体内容。替换具体内容：通用变量字段：收件人姓名、收件人称谓、公司，这三个字段内容从收件人联系人获取
-                        apiSendMailDto.setContent(apiEmailContactService.replacePlaceholders(emailTask.getContent(),recipient.getContactBizId()));
+                        //检测内容是否含有通用变量
+                        if (StringUtil.hasTyVariables(emailTask.getContent())) {
+                            String content = apiEmailContactService.replacePlaceholders(emailTask.getContent(),recipient.getContactBizId());
+                            apiSendMailDto.setContent(content);
                         }
+                    }
+
                     // 调用邮件服务发送邮件
                     apiEmailService.sendMail(apiSendMailDto);
 

yd-email-feign/src/main/java/com/yd/email/feign/utils/StringUtil.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 
 @Slf4j
 public class StringUtil {
@@ -39,6 +40,18 @@ public class StringUtil {
     }
 
     /**
+     * 检测内容是否有通用三个变量：通用变量：收件人姓名：{{name}}、收件人称谓： {{appellation}}、公司：{{compantName}}
+     * @param content
+     * @return
+     */
+    public static boolean hasTyVariables(String content) {
+        if (StringUtils.isBlank(content)) {
+            return false;
+        }
+        return (content.contains("{{name}}") || content.contains("{{appellation}}") || content.contains("{{compantName}}"));
+    }
+
+    /**
      * 检测内容是否有占位符
      * @param content
      * @return