zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
chenbowen
2025-11-25 19:15:29 +08:00
parent f16509c107 067f7226f4
commit 829229a355
5 changed files with 227 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-gateway/src/main/resources/application-dev.yaml
View File

@@ -4,8 +4,8 @@ spring:
cloud: cloud:
nacos: nacos:
server-addr: 172.16.46.63:30848 # Nacos 服务器地址 server-addr: 172.16.46.63:30848 # Nacos 服务器地址
username: # Nacos 账号 username: ${config.username} # Nacos 账号
password: # Nacos 密码 password: ${config.password} # Nacos 密码
discovery: # 【配置中心】配置项 discovery: # 【配置中心】配置项
namespace: ${config.namespace} # 命名空间。这里使用 maven Profile 资源过滤进行动态替换 namespace: ${config.namespace} # 命名空间。这里使用 maven Profile 资源过滤进行动态替换
group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP

222
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/client/impl/CmccMasSmsClient.java Normal file
View File

File diff suppressed because it is too large Load Diff

1
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/client/impl/SmsClientFactoryImpl.java
View File

@@ -81,6 +81,7 @@ public class SmsClientFactoryImpl implements SmsClientFactory {
case TENCENT: return new TencentSmsClient(properties); case TENCENT: return new TencentSmsClient(properties);
case HUAWEI: return new HuaweiSmsClient(properties); case HUAWEI: return new HuaweiSmsClient(properties);
case QINIU: return new QiniuSmsClient(properties); case QINIU: return new QiniuSmsClient(properties);
case CMCC_MAS: return new CmccMasSmsClient(properties);
} }
// 创建失败，错误日志 + 抛出异常 // 创建失败，错误日志 + 抛出异常
log.error("[createSmsClient][配置({}) 找不到合适的客户端实现]", properties); log.error("[createSmsClient][配置({}) 找不到合适的客户端实现]", properties);

1
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/sms/core/enums/SmsChannelEnum.java
View File

@@ -19,6 +19,7 @@ public enum SmsChannelEnum {
TENCENT("TENCENT", "腾讯云"), TENCENT("TENCENT", "腾讯云"),
HUAWEI("HUAWEI", "华为云"), HUAWEI("HUAWEI", "华为云"),
QINIU("QINIU", "七牛云"), QINIU("QINIU", "七牛云"),
CMCC_MAS("CMCC_MAS", "中国移动云MAS"),
; ;
/** /**

2
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/sms/SmsSendServiceImpl.java
View File

@@ -94,6 +94,7 @@ public class SmsSendServiceImpl implements SmsSendService {
Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(template.getStatus()) Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(template.getStatus())
&& CommonStatusEnum.ENABLE.getStatus().equals(smsChannel.getStatus()); && CommonStatusEnum.ENABLE.getStatus().equals(smsChannel.getStatus());
String content = smsTemplateService.formatSmsTemplateContent(template.getContent(), templateParams); String content = smsTemplateService.formatSmsTemplateContent(template.getContent(), templateParams);
Long sendLogId = smsLogService.createSmsLog(mobile, userId, userType, isSend, template, content, templateParams); Long sendLogId = smsLogService.createSmsLog(mobile, userId, userType, isSend, template, content, templateParams);
// 发送 MQ 消息，异步执行发送短信 // 发送 MQ 消息，异步执行发送短信
@@ -183,7 +184,6 @@ public class SmsSendServiceImpl implements SmsSendService {
if (CollUtil.isEmpty(receiveResults)) { if (CollUtil.isEmpty(receiveResults)) {
return; return;
} }
// 更新短信日志的接收结果. 因为量一般不大，所以先使用 for 循环更新
receiveResults.forEach(result -> smsLogService.updateSmsReceiveResult(result.getLogId(), receiveResults.forEach(result -> smsLogService.updateSmsReceiveResult(result.getLogId(),
result.getSuccess(), result.getReceiveTime(), result.getErrorCode(), result.getErrorMsg())); result.getSuccess(), result.getReceiveTime(), result.getErrorCode(), result.getErrorMsg()));
} }