From ad153db41892fe27a5abc40336b6a879568fd41e Mon Sep 17 00:00:00 2001 From: yanglin Date: Tue, 17 Dec 2024 16:32:24 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3444:=20=E8=B0=83=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6=E6=88=AA=E6=96=AD=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msg/center/api/request/VariableAbbreviation.java | 4 +++- .../notices/manager/SmsSendManagerComposite.java | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/VariableAbbreviation.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/VariableAbbreviation.java index da02be1a..257b92be 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/VariableAbbreviation.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/VariableAbbreviation.java @@ -10,8 +10,10 @@ import lombok.Setter; @Getter public class VariableAbbreviation { + public static final int DEFAULT_MAX_LENGTH = 32; + public static VariableAbbreviation defaultAbbreviate() { - return abbreviate(32); + return abbreviate(DEFAULT_MAX_LENGTH); } public static VariableAbbreviation abbreviate(int maxLength) { diff --git a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/SmsSendManagerComposite.java b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/SmsSendManagerComposite.java index 36d6f43c..a669182d 100644 --- a/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/SmsSendManagerComposite.java +++ b/msg-notices/msg-notices-manager/src/main/java/cn/axzo/msg/center/notices/manager/SmsSendManagerComposite.java @@ -8,10 +8,10 @@ import cn.axzo.msg.center.notices.common.enums.ChannelHandlerEnum; import cn.axzo.msg.center.notices.common.enums.ReturnCodeEnum; import cn.axzo.msg.center.notices.common.exception.BizException; import cn.axzo.msg.center.notices.manager.api.SmsSendManager; -import cn.axzo.msg.center.notices.manager.api.dto.response.BatchMessageSendResponseDto; -import cn.axzo.msg.center.notices.manager.api.dto.response.SendSmsCommonResponseDto; import cn.axzo.msg.center.notices.manager.api.dto.request.BatchMessageSendRequestDto; import cn.axzo.msg.center.notices.manager.api.dto.request.MessageSendRequestDto; +import cn.axzo.msg.center.notices.manager.api.dto.response.BatchMessageSendResponseDto; +import cn.axzo.msg.center.notices.manager.api.dto.response.SendSmsCommonResponseDto; import cn.azxo.framework.common.utils.LogUtil; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; @@ -173,10 +173,12 @@ public class SmsSendManagerComposite implements SmsSendManager, ApplicationConte } if (str != null) { int size = str.length(); - if ( size <= abbreviation.getMaxLength() + 3 ) { + int maxLength = abbreviation.getMaxLength(); + if (maxLength <= 0) maxLength = VariableAbbreviation.DEFAULT_MAX_LENGTH; + if (size <= maxLength + 3) { return str; } - return str.substring(0, abbreviation.getMaxLength()) + "..."; + return str.substring(0, maxLength) + "..."; } return ""; }