From 820a87334408ba8a1bd38cb4fb108ae72ee83003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Tue, 14 Sep 2021 11:18:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=88=99=E6=A0=A1=E9=AA=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notification/model/dao/entity/vo/DeleteNotificationsVo.java | 2 +- .../model/dao/entity/vo/NewSysNotificationParamsVo.java | 2 +- .../notification/model/dao/entity/vo/NewSysNotificationVo.java | 2 +- .../model/dao/entity/vo/UpdateNotificationStatusParamsVo.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/DeleteNotificationsVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/DeleteNotificationsVo.java index 5464ec1..f5c85ec 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/DeleteNotificationsVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/DeleteNotificationsVo.java @@ -10,7 +10,7 @@ import javax.validation.constraints.Pattern; public class DeleteNotificationsVo { @ApiModelProperty(value = "消息ids", required = true) @NotBlank - @Pattern(regexp = "^\\d+(,\\d+)*$", message = "消息id串非法") + @Pattern(regexp = "^(\\-|\\+?)\\d+(,\\d+)*$", message = "消息id串非法") private String notificationIds; @ApiModelProperty(value = "消息接收者", required = true) diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationParamsVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationParamsVo.java index 1e95b95..65c12ff 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationParamsVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationParamsVo.java @@ -21,7 +21,7 @@ public class NewSysNotificationParamsVo { private Integer sender; @ApiModelProperty(value = "消息接收者", required = true) - @Pattern(regexp = "^\\d+(,\\d+)*$", message = "接收者id串非法") + @Pattern(regexp = "^(\\-|\\+?)\\d+(,\\d+)*$", message = "接收者id串非法") @NotBlank(message = "消息接收者不能为空") private String receivers; diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java index 7b51def..a06bd7d 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewSysNotificationVo.java @@ -18,7 +18,7 @@ public class NewSysNotificationVo { private Integer sender; @ApiModelProperty(value = "消息接收者", required = true) - @Pattern(regexp = "^\\d+(,\\d+)*$", message = "接收者id串非法") + @Pattern(regexp = "^(\\-|\\+?)\\d+(,\\d+)*$", message = "接收者id串非法") @NotBlank(message = "消息接收者不能为空") private String receivers; diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/UpdateNotificationStatusParamsVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/UpdateNotificationStatusParamsVo.java index 275fb48..731f39b 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/UpdateNotificationStatusParamsVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/UpdateNotificationStatusParamsVo.java @@ -15,7 +15,7 @@ import javax.validation.constraints.Pattern; public class UpdateNotificationStatusParamsVo { @ApiModelProperty(value = "消息ids", required = true) @NotBlank - @Pattern(regexp = "^\\d+(,\\d+)*$", message = "消息id串非法") + @Pattern(regexp = "^(\\-|\\+?)\\d+(,\\d+)*$", message = "消息id串非法") private String notificationIds; @ApiModelProperty(value = "已读状态: 1未读，2已读", required = true)