wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-3045' into dev

Browse Source
This commit is contained in:
yanglin 2024-10-12 17:13:43 +08:00
commit 02c030b786
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateButtonV3ServiceImpl.java
View File

@ -46,7 +46,7 @@ public class MessageTemplateButtonV3ServiceImpl implements MessageTemplateButton
if (item.getCategory() == RouterCategoryEnum.ACTION) {
item.setUrlConfig(null);
}
if (item.getUrlConfig() != null) {
if (item.getCategory() != RouterCategoryEnum.JUMP) {
item.getUrlConfig().setFieldsNullIfUrlAbsent();
}
return buttonV3;

1
msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageTemplateButtonV3DTO.java
View File

@ -126,6 +126,7 @@ public class MessageTemplateButtonV3DTO implements Serializable {
if (apiUrl == null) throw new ServiceException("接口调用地址不能为空");
} else if (RouterCategoryEnum.JUMP.equals(category)) {
if (urlConfig == null) throw new ServiceException("跳转地址不能为空");
if (!urlConfig.hasUrl()) throw new ServiceException("跳转地址不能为空");
}
}

8
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateV3CreateRequest.java
View File

@ -40,14 +40,14 @@ public class MessageTemplateV3CreateRequest implements Serializable {
/**
* 模板名称
*/
@NotBlank(message = "templateName is required")
@NotBlank(message = "模板名称不能为空")
private String templateName;
/**
* 消息类型
* NOTIFICATION: 通知
* PENDING: 待办
*/
@NotNull(message = "category is required")
@NotNull(message = "消息类型不能为空")
private MessageGroupCategoryEnum category;
/**
* 消息类型
@ -73,12 +73,12 @@ public class MessageTemplateV3CreateRequest implements Serializable {
/**
* 消息标题
*/
@NotBlank(message = "msgTitle is required")
@NotBlank(message = "消息标题不能为空")
private String msgTitle;
/**
* 消息内容
*/
@NotBlank(message = "msgContent is required")
@NotBlank(message = "消息内容不能为空")
private String msgContent;
/**
* 消息图标

6
msg-center-api/src/main/java/cn/axzo/msg/center/service/template/request/MessageTemplateV3UpdateRequest.java
View File

@ -39,11 +39,12 @@ public class MessageTemplateV3UpdateRequest implements Serializable {
/**
* 模板编码
*/
@NotBlank(message = "templateCode is required")
@NotBlank(message = "模板编码不能为空")
private String templateCode;
/**
* 模板名称
*/
@NotBlank(message = "模板名称不能为空")
private String templateName;
/**
@ -51,7 +52,6 @@ public class MessageTemplateV3UpdateRequest implements Serializable {
* NOTIFICATION: 通知
* PENDING: 待办
*/
@NotNull(message = "category is required")
private MessageGroupCategoryEnum category;
/**
@ -78,10 +78,12 @@ public class MessageTemplateV3UpdateRequest implements Serializable {
/**
* 消息标题
*/
@NotBlank(message = "消息标题不能为空")
private String msgTitle;
/**
* 消息内容
*/
@NotBlank(message = "消息内容不能为空")
private String msgContent;
/**
* 消息图标