From 0b86ee9d21bbe71bb597108c6fc090bbf2e6b6a7 Mon Sep 17 00:00:00 2001 From: zhongzb <972627721@qq.com> Date: Sat, 1 Jul 2023 13:15:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B6=88=E6=81=AF=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/chat/domain/entity/msg/FileMsgDTO.java | 5 +++++ .../common/chat/domain/entity/msg/SoundMsgDTO.java | 5 +++++ .../common/chat/domain/entity/msg/VideoMsgDTO.java | 6 ++++-- .../common/exception/GlobalExceptionHandler.java | 4 ++-- .../abin/mallchat/common/common/utils/AssertUtil.java | 10 +++++----- .../custom/chat/domain/vo/request/msg/TextMsgReq.java | 4 +++- .../chat/service/strategy/msg/TextMsgHandler.java | 1 - 7 files changed, 24 insertions(+), 11 deletions(-) diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java index d030c6d..0b487d0 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/FileMsgDTO.java @@ -6,6 +6,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -20,12 +22,15 @@ import java.io.Serializable; public class FileMsgDTO implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("大小（字节）") + @NotNull private Long size; @ApiModelProperty("下载地址") + @NotBlank private String url; @ApiModelProperty("文件名（带后缀）") + @NotBlank private String fileName; } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java index 2b2fac9..e965eea 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/SoundMsgDTO.java @@ -6,6 +6,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -20,11 +22,14 @@ import java.io.Serializable; public class SoundMsgDTO implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("大小（字节）") + @NotNull private Long size; @ApiModelProperty("时长（秒）") + @NotNull private Integer second; @ApiModelProperty("下载地址") + @NotBlank private String url; } diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java index 0fcf2ba..49136ac 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/chat/domain/entity/msg/VideoMsgDTO.java @@ -9,7 +9,6 @@ import lombok.NoArgsConstructor; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.math.BigDecimal; /** * Description: 视频消息入参 @@ -23,20 +22,23 @@ import java.math.BigDecimal; public class VideoMsgDTO implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("大小（字节）") + @NotNull private Long size; @ApiModelProperty("下载地址") + @NotBlank private String url; @ApiModelProperty("缩略图宽度（像素）") @NotNull - private Integer thumbWidth = BigDecimal.ROUND_HALF_DOWN; + private Integer thumbWidth; @ApiModelProperty("缩略图高度（像素）") @NotNull private Integer thumbHeight; @ApiModelProperty("缩略图大小（字节）") + @NotNull private Long thumbSize; @ApiModelProperty("缩略图下载地址") diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java index fad1667..3a986e1 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/exception/GlobalExceptionHandler.java @@ -22,7 +22,7 @@ public class GlobalExceptionHandler { e.getBindingResult().getFieldErrors().forEach(x -> errorMsg.append(x.getField()).append(x.getDefaultMessage()).append(",")); String message = errorMsg.toString(); log.info("validation parameters error！The reason is:{}", message); - return ApiResult.fail(-1, message.substring(0, message.length() - 1)); + return ApiResult.fail(CommonErrorEnum.PARAM_VALID.getErrorCode(), message.substring(0, message.length() - 1)); } /** @@ -34,7 +34,7 @@ public class GlobalExceptionHandler { e.getBindingResult().getFieldErrors().forEach(x -> errorMsg.append(x.getField()).append(x.getDefaultMessage()).append(",")); String message = errorMsg.toString(); log.info("validation parameters error！The reason is:{}", message); - return ApiResult.fail(-1, message.substring(0, message.length() - 1)); + return ApiResult.fail(CommonErrorEnum.PARAM_VALID.getErrorCode(), message.substring(0, message.length() - 1)); } /** diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java index 81956cf..0301132 100644 --- a/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java +++ b/mallchat-common/src/main/java/com/abin/mallchat/common/common/utils/AssertUtil.java @@ -1,11 +1,11 @@ package com.abin.mallchat.common.common.utils; import cn.hutool.core.util.ObjectUtil; -import com.abin.mallchat.common.common.exception.*; -import lombok.SneakyThrows; +import com.abin.mallchat.common.common.exception.BusinessErrorEnum; +import com.abin.mallchat.common.common.exception.BusinessException; +import com.abin.mallchat.common.common.exception.CommonErrorEnum; +import com.abin.mallchat.common.common.exception.ErrorEnum; import org.hibernate.validator.HibernateValidator; -import org.springframework.validation.BindException; -import org.springframework.validation.BindingResult; import javax.validation.ConstraintViolation; import javax.validation.Validation; @@ -57,7 +57,7 @@ public class AssertUtil { errorMsg.append(violation.getPropertyPath().toString()).append(":").append(violation.getMessage()).append(","); } //去掉最后一个逗号 - throwException(errorMsg.toString().substring(0,errorMsg.length()-1)); + throwException(CommonErrorEnum.PARAM_VALID, errorMsg.toString().substring(0, errorMsg.length() - 1)); } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/msg/TextMsgReq.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/msg/TextMsgReq.java index 05d9abf..4ccfee4 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/msg/TextMsgReq.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/domain/vo/request/msg/TextMsgReq.java @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; + import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.util.List; @@ -21,7 +22,7 @@ import java.util.List; public class TextMsgReq { @NotBlank(message = "内容不能为空") - @Size(max = 5,message = "消息内容过长，服务器扛不住啊，兄dei") + @Size(max = 1024, message = "消息内容过长，服务器扛不住啊，兄dei") @ApiModelProperty("消息内容") private String content; @@ -29,5 +30,6 @@ public class TextMsgReq { private Long replyMsgId; @ApiModelProperty("艾特的uid") + @Size(max = 10, message = "一次别艾特这么多人") private List atUidList; } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java index d151e7d..d8e347a 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/strategy/msg/TextMsgHandler.java @@ -65,7 +65,6 @@ public class TextMsgHandler extends AbstractMsgHandler { AssertUtil.equal(replyMsg.getRoomId(), request.getRoomId(), "只能回复相同会话内的消息"); } if (CollectionUtil.isNotEmpty(body.getAtUidList())) { - AssertUtil.isTrue(body.getAtUidList().size() < 10, "一次别艾特这么多人"); List atUidList = body.getAtUidList(); Map batch = userInfoCache.getBatch(atUidList); AssertUtil.equal(atUidList.size(), batch.values().size(), "@用户不存在");