diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageMappingProcessor.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageMappingProcessor.java index d3234cba..66048567 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageMappingProcessor.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageMappingProcessor.java @@ -19,7 +19,6 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; -import java.util.function.Function; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; @@ -40,7 +39,7 @@ public class MessageMappingProcessor implements EventMappingProcessor { private final ImClient imClient; /** - * @Scope("prototype") -> we're good + * Scope("prototype") -> we're good */ @Setter private TemplateMessage template; @@ -70,7 +69,7 @@ public class MessageMappingProcessor implements EventMappingProcessor { public TemplateSendResultV3 buildTemplateSendResult() { TemplateSendResultV3 templateResult = new TemplateSendResultV3(); templateResult.setTemplateCode(template.getTemplateCode()); - templateResult.setBizActionCategory(template.getConfig().getCategory()); + templateResult.setChannel(template.getConfig().getCategory()); for (MessageRecordV3 message : template.getMessageRecords()) { templateResult.addResult(new MessageSendResultV3( message.getReceiverPersonId(), message.getId())); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/TemplateMessage.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/TemplateMessage.java index edf5cd80..edcd75e5 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/TemplateMessage.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/TemplateMessage.java @@ -138,22 +138,16 @@ public class TemplateMessage { // ------------------------------- 辅助方法 String parseTitle() { - if (title != null) { - return title; + if (title == null) { + title = PlaceholderResolver.tryResolve(template.getTitle(), req.getBizExtParams()); } - title = req.getBizExtParams() == null - ? template.getTitle() - : PlaceholderResolver.resolve(template.getTitle(), req.getBizExtParams()); return title; } String parseContent() { - if (content != null) { - return content; + if (content == null) { + content = PlaceholderResolver.tryResolve(template.getContent(), req.getBizExtParams()); } - content = req.getBizExtParams() == null - ? template.getContent() - : PlaceholderResolver.resolve(template.getContent(), req.getBizExtParams()); return content; } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/v3/MessageSendResultV3.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/v3/MessageSendResultV3.java index e17a68fa..cb894cdb 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/v3/MessageSendResultV3.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/v3/MessageSendResultV3.java @@ -17,11 +17,11 @@ import java.io.Serializable; @AllArgsConstructor public class MessageSendResultV3 implements Serializable { /** - * 接收者ID + * 接收者id */ private Long receiverPersonId; /** - * 消息id或者待办id + * 渠道结果id */ private Long resultId; diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/v3/TemplateSendResultV3.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/v3/TemplateSendResultV3.java index e44d8771..d0346a47 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/v3/TemplateSendResultV3.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/response/v3/TemplateSendResultV3.java @@ -28,10 +28,11 @@ public class TemplateSendResultV3 implements Serializable { @Getter private String templateCode; /** - * NOTIFICATION: 通知, PENDING: 待办 + * 渠道 + *
NOTIFICATION: 通知, PENDING: 待办
*/
@Getter
- private String bizActionCategory;
+ private String channel;
public void addResult(MessageSendResultV3 result) {
receiverPersonId2SendResult.put(result.getReceiverPersonId(), result);
diff --git a/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java b/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java
index 8f5af3c2..65d08013 100644
--- a/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java
+++ b/msg-center-common/src/main/java/cn/axzo/msg/center/common/utils/PlaceholderResolver.java
@@ -2,7 +2,11 @@ package cn.axzo.msg.center.common.utils;
import org.apache.commons.compress.utils.Lists;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import java.util.function.Function;
import java.util.stream.Stream;
@@ -46,7 +50,10 @@ public class PlaceholderResolver {
this.placeholderSuffix = placeholderSuffix;
}
- public static String resolve(String template, Map