third / fw-hermes

Commit b1fa622119362ba42dcf39b8d5a595d16c0f719b

Authored by chenyonghong
1 parent 292fcb03

fix -> sdk -> 扩展参数字段

Inline Side-by-side
Showing 3 changed files with 4 additions and 2 deletions
fw-hermes-sdk/src/main/java/cn/fw/hermes/sdk/api/para/MsgParamCondition.java
  View file @b1fa622
... ... @@ -4,6 +4,7 @@ import java.math.BigDecimal;
4 4 import java.util.List;
5 5 import java.util.Map;
6 6 import lombok.Data;
  7 +import org.hibernate.validator.constraints.ScriptAssert;
7 8 import org.springframework.util.CollectionUtils;
8 9  
9 10 /**
... ... @@ -216,6 +217,7 @@ public class MsgParamCondition {
216 217 title = title == null ? "" : title;
217 218 customContent.setData(title);
218 219 customContent.setDesc(desc);
  220 + customContent.setExt(ext);
219 221 lifeTime = lifeTime == null ? 604800 : lifeTime;
220 222 if (lifeTime / 604800 > 0) {
221 223 lifeTime = 604800;
... ...
fw-hermes-server/src/main/java/cn/fw/hermes/task/SendMessageTask.java
  View file @b1fa622
... ... @@ -106,8 +106,7 @@ public class SendMessageTask {
106 106 if (!StringUtils.isEmpty(sysMsgStr)) {
107 107 SysMsg sysMsg = JSON.parseObject(sysMsgStr, SysMsg.class);
108 108 if (sysMsg.getRetriesNum() < 3) {
109   - log.info("{} 失败 进行第 {} 次重试,messageId[{}]", msg, sysMsg.getRetriesNum() + 1,
110   - sysMsg.getMessageId());
  109 + log.info("{} 失败 进行第 {} 次重试,messageId[{}]", msg, sysMsg.getRetriesNum() + 1, sysMsg.getMessageId());
111 110 sysMsg.setRetriesNum(sysMsg.getRetriesNum() + 1);
112 111 messageBizService.saveMsg(sysMsg);
113 112 } else {
... ...
fw-hermes-service/src/main/java/cn/fw/hermes/service/biz/MessageBizService.java
  View file @b1fa622
... ... @@ -172,6 +172,7 @@ public class MessageBizService {
172 172 BV.isTrue(msgBodyDto.getMsgBody() != null, "消息内容不合法");
173 173 //如果消息是自定义消息，则检查对应的消息业务类型是否存在
174 174 if (msgBodyDto.getMsgTypeEnum().getCode().equals(MsgTypeEnum.CUSTOM.getCode())) {
  175 + BV.notNull(msgPara.getCustomContent().getExt(),"扩展字段参数不能为空");
175 176 this.checkExt(msgPara);
176 177 }
177 178 //获取发送方用户识别码
... ...