|
@@ -179,6 +179,7 @@ public class CommonServiceImpl implements ICommonService {
|
|
try {
|
|
try {
|
|
Long userId = null;
|
|
Long userId = null;
|
|
String websize = "";
|
|
String websize = "";
|
|
|
|
+ String title = "";
|
|
ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
|
|
ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
|
|
if(Objects.isNull(scenePlus)){
|
|
if(Objects.isNull(scenePlus)){
|
|
ScenePro scenePro = sceneProService.getByNum(num);
|
|
ScenePro scenePro = sceneProService.getByNum(num);
|
|
@@ -187,10 +188,12 @@ public class CommonServiceImpl implements ICommonService {
|
|
}
|
|
}
|
|
userId = scenePro.getUserId();
|
|
userId = scenePro.getUserId();
|
|
websize = scenePro.getWebSite();
|
|
websize = scenePro.getWebSite();
|
|
|
|
+ title = scenePro.getSceneName();
|
|
}else{
|
|
}else{
|
|
userId = scenePlus.getUserId();
|
|
userId = scenePlus.getUserId();
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
websize = scenePlusExt.getWebSite();
|
|
websize = scenePlusExt.getWebSite();
|
|
|
|
+ title = scenePlus.getTitle();
|
|
}
|
|
}
|
|
|
|
|
|
if(Objects.isNull(userId)){
|
|
if(Objects.isNull(userId)){
|
|
@@ -210,7 +213,7 @@ public class CommonServiceImpl implements ICommonService {
|
|
websize += "&lang=" + lang;
|
|
websize += "&lang=" + lang;
|
|
|
|
|
|
MailTemplate mailTemplate = mailTemplateService.getOne(new LambdaQueryWrapper<MailTemplate>().eq(MailTemplate::getRemark, "计算完成").eq(MailTemplate::getLang, lang));
|
|
MailTemplate mailTemplate = mailTemplateService.getOne(new LambdaQueryWrapper<MailTemplate>().eq(MailTemplate::getRemark, "计算完成").eq(MailTemplate::getLang, lang));
|
|
- String content = mailTemplate.getMsg().replaceAll("scene_name", scenePlus.getTitle()).replaceAll("scene_link", websize).replaceAll("help_link", helpLink);
|
|
|
|
|
|
+ String content = mailTemplate.getMsg().replaceAll("scene_name", title).replaceAll("scene_link", websize).replaceAll("help_link", helpLink);
|
|
SendMailAcceUtils.sendMail(mailTemplate.getSendMail(), mailTemplate.getSendPassword(), mailTemplate.getSendHost(), toEmail, mailTemplate.getSubject(), content, null);
|
|
SendMailAcceUtils.sendMail(mailTemplate.getSendMail(), mailTemplate.getSendPassword(), mailTemplate.getSendHost(), toEmail, mailTemplate.getSubject(), content, null);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
log.error("发送邮件失败,num:" + num, e);
|
|
log.error("发送邮件失败,num:" + num, e);
|