Browse Source

//..notice

release_toaliyun_real
xhxu 2 years ago
parent
commit
d18992bf90
2 changed files with 9 additions and 4 deletions
  1. +5
    -2
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java

+ 5
- 2
mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java View File

@@ -60,9 +60,12 @@ public class SendEmailServiceImpl implements MsgSendService {
WxMsgValidationcodeModel wxMsgModel = modelList.get(0);

String msg = wxMsgModel.getContent();
for (Map.Entry<String, String> entry : mailMsg.getDynamicContentMap().entrySet()) {
msg = msg.replace("{"+entry.getKey()+"}", entry.getValue());
if(mailMsg.getDynamicContentMap() != null){
for (Map.Entry<String, String> entry : mailMsg.getDynamicContentMap().entrySet()) {
msg = msg.replace("{"+entry.getKey()+"}", entry.getValue());
}
}

if(StringUtils.isNotBlank(wxMsgModel.getEmailBgImg())){
msg = msg.replace("{bg}", wxMsgModel.getEmailBgImg());
}


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java View File

@@ -103,8 +103,10 @@ public class SendSmsServiceImpl implements MsgSendService {
wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature());
//替换短信内容
String msg = wxMsgValidationcodeModel.getContent();
for (Map.Entry<String, String> entry : record.getDynamicContentMap().entrySet()) {
msg = msg.replace("{"+entry.getKey()+"}", entry.getValue());
if(record.getDynamicContentMap() != null){
for (Map.Entry<String, String> entry : record.getDynamicContentMap().entrySet()) {
msg = msg.replace("{"+entry.getKey()+"}", entry.getValue());
}
}

wxMsgValidationcode.setMsg(msg);


Loading…
Cancel
Save