From 76619824474d72a1fb9054bf4e610b6f63e72ff8 Mon Sep 17 00:00:00 2001 From: hewencai <2357300448@qq.com> Date: Tue, 23 Dec 2025 18:20:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=EF=BC=9A=E5=8D=87=E7=BA=A7seata?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=B02.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zt-dependencies/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/zt-dependencies/pom.xml b/zt-dependencies/pom.xml index b5c1f76c..8881c31e 100644 --- a/zt-dependencies/pom.xml +++ b/zt-dependencies/pom.xml @@ -32,6 +32,7 @@ 3.4.5 2024.0.1 2023.0.3.2 + 2.4.0 2.8.3 4.6.0 @@ -133,6 +134,18 @@ import + + + org.apache.seata + seata-all + ${seata.version} + + + org.apache.seata + seata-spring-boot-starter + ${seata.version} + + io.github.mouzt From 7e87465ef9a90e10d516a149c7133a93ce9bcb61 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Wed, 24 Dec 2025 10:14:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E6=9C=89=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E7=9F=AD=E4=BF=A1=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/system/enums/ErrorCodeConstants.java | 4 ++-- .../plat/module/system/service/sms/SmsCodeServiceImpl.java | 6 +++--- .../src/main/resources/application.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/ErrorCodeConstants.java b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/ErrorCodeConstants.java index 8178c53e..fd2aee37 100644 --- a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/ErrorCodeConstants.java +++ b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/enums/ErrorCodeConstants.java @@ -127,8 +127,8 @@ public interface ErrorCodeConstants { ErrorCode SMS_CODE_NOT_FOUND = new ErrorCode(1_002_014_000, "验证码不存在"); ErrorCode SMS_CODE_EXPIRED = new ErrorCode(1_002_014_001, "验证码已过期"); ErrorCode SMS_CODE_USED = new ErrorCode(1_002_014_002, "验证码已使用"); - ErrorCode SMS_CODE_EXCEED_SEND_MAXIMUM_QUANTITY_PER_DAY = new ErrorCode(1_002_014_004, "超过每日短信发送数量"); - ErrorCode SMS_CODE_SEND_TOO_FAST = new ErrorCode(1_002_014_005, "短信发送过于频繁"); + ErrorCode SMS_CODE_EXCEED_SEND_MAXIMUM_QUANTITY_PER_DAY = new ErrorCode(1_002_014_004, "超过每日短信发送数量:{}次"); + ErrorCode SMS_CODE_SEND_TOO_FAST = new ErrorCode(1_002_014_005, "短信发送过于频繁,请于{}分钟后再试"); // ========== 租户信息 1-002-015-000 ========== ErrorCode TENANT_NOT_EXISTS = new ErrorCode(1_002_015_000, "租户不存在"); diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/sms/SmsCodeServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/sms/SmsCodeServiceImpl.java index 9661a239..bc31fbad 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/sms/SmsCodeServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/sms/SmsCodeServiceImpl.java @@ -10,10 +10,10 @@ import com.zt.plat.module.system.dal.dataobject.sms.SmsCodeDO; import com.zt.plat.module.system.dal.mysql.sms.SmsCodeMapper; import com.zt.plat.module.system.enums.sms.SmsSceneEnum; import com.zt.plat.module.system.framework.sms.config.SmsCodeProperties; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import jakarta.annotation.Resource; import java.time.LocalDateTime; import static cn.hutool.core.util.RandomUtil.randomInt; @@ -56,11 +56,11 @@ public class SmsCodeServiceImpl implements SmsCodeService { if (lastSmsCode != null) { if (LocalDateTimeUtil.between(lastSmsCode.getCreateTime(), LocalDateTime.now()).toMillis() < smsCodeProperties.getSendFrequency().toMillis()) { // 发送过于频繁 - throw exception(SMS_CODE_SEND_TOO_FAST); + throw exception(SMS_CODE_SEND_TOO_FAST, smsCodeProperties.getSendFrequency().toMinutes()); } if (isToday(lastSmsCode.getCreateTime()) && // 必须是今天，才能计算超过当天的上限 lastSmsCode.getTodayIndex() >= smsCodeProperties.getSendMaximumQuantityPerDay()) { // 超过当天发送的上限。 - throw exception(SMS_CODE_EXCEED_SEND_MAXIMUM_QUANTITY_PER_DAY); + throw exception(SMS_CODE_EXCEED_SEND_MAXIMUM_QUANTITY_PER_DAY, smsCodeProperties.getSendMaximumQuantityPerDay()); } // TODO ZT：提升，每个 IP 每天可发送数量 // TODO ZT：提升，每个 IP 每小时可发送数量 diff --git a/zt-module-system/zt-module-system-server/src/main/resources/application.yaml b/zt-module-system/zt-module-system-server/src/main/resources/application.yaml index 2b0a2558..853e32cd 100644 --- a/zt-module-system/zt-module-system-server/src/main/resources/application.yaml +++ b/zt-module-system/zt-module-system-server/src/main/resources/application.yaml @@ -241,8 +241,8 @@ zt: expire-times: 10m send-frequency: 1m send-maximum-quantity-per-day: 10 - begin-code: 9999 # 这里配置 9999 的原因是，测试方便。 - end-code: 9999 # 这里配置 9999 的原因是，测试方便。 + begin-code: 100000 + end-code: 999999 # E办OAuth2配置文件