Middleware/msgpush
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2026-05-11 13:57:02 +08:00
parent 9343799290
commit fe26aa8670
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/client/sender/impl/email/AliyunEmailSender.java
View File

@@ -1,7 +1,6 @@
package com.njcn.msgpush.module.push.client.sender.impl.email; package com.njcn.msgpush.module.push.client.sender.impl.email;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.aliyun.dm20151123.Client; import com.aliyun.dm20151123.Client;
import com.aliyun.dm20151123.models.*; import com.aliyun.dm20151123.models.*;
import com.aliyun.teaopenapi.models.Config; import com.aliyun.teaopenapi.models.Config;
@@ -81,10 +80,11 @@ public class AliyunEmailSender implements EmailSender {
message.setCostTime(costTime); message.setCostTime(costTime);
if (HttpStatus.OK.value() == response.getStatusCode()) { if (HttpStatus.OK.value() == response.getStatusCode()) {
message.setThirdPartyId(response.getBody().getEnvId());
// 电信短信同步返回成功同样只代表已受理，最终状态以后续回执为准。 // 电信短信同步返回成功同样只代表已受理，最终状态以后续回执为准。
this.getDownInfo(message); this.getDownInfo(message);
// 邮件接口同步返回成功时，当前平台直接认定本次发送成功。 // 邮件接口同步返回成功时，当前平台直接认定本次发送成功。
return SendResult.success(now, costTime, null); return SendResult.accepted(now, costTime, response.getBody().getEnvId());
} }
// 邮件服务失败同样统一转换为平台错误码和中文错误信息。 // 邮件服务失败同样统一转换为平台错误码和中文错误信息。
@@ -119,8 +119,6 @@ public class AliyunEmailSender implements EmailSender {
.setLength(1); .setLength(1);
try { try {
SenderStatisticsDetailByParamResponse detail = this.emailClient.senderStatisticsDetailByParam(request); SenderStatisticsDetailByParamResponse detail = this.emailClient.senderStatisticsDetailByParam(request);
System.out.println("@@@=" + JSON.toJSONString(detail));
if (detail.statusCode == 200) { if (detail.statusCode == 200) {
List<SenderStatisticsDetailByParamResponseBody.SenderStatisticsDetailByParamResponseBodyDataMailDetail> mailDetailList = detail.body.getData().mailDetail; List<SenderStatisticsDetailByParamResponseBody.SenderStatisticsDetailByParamResponseBodyDataMailDetail> mailDetailList = detail.body.getData().mailDetail;

3
msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/service/message/MessageRecordServiceImpl.java
View File

@@ -193,6 +193,9 @@ public class MessageRecordServiceImpl extends ServiceImpl<MessageRecordMapper, M
// 成功或已受理都视为本次调用已正常投递，更新成功健康度并消耗配额。 // 成功或已受理都视为本次调用已正常投递，更新成功健康度并消耗配额。
if (SendOutcome.ACCEPTED.equals(sendResult.getOutcome())) { if (SendOutcome.ACCEPTED.equals(sendResult.getOutcome())) {
messageConfirmRedisDAO.addToConfirmQueue(messageRecordDO); messageConfirmRedisDAO.addToConfirmQueue(messageRecordDO);
systemQuotaRedisDAO.set(messageRecordDO.getChannel(), messageRecordDO.getAppName());
rateLimitRedisDAO.set(messageRecordDO.getChannel(), messageRecordDO.getAppName(), messageRecordDO.getReceiver());
} else if (SendOutcome.RETRYABLE_FAILED.equals(sendResult.getOutcome())) { } else if (SendOutcome.RETRYABLE_FAILED.equals(sendResult.getOutcome())) {
messageRetryQueueService.saveOrUpdateRetryMessage(messageRecordDO); messageRetryQueueService.saveOrUpdateRetryMessage(messageRecordDO);
channelProviderConfigService.failureUpdate(messageRecordDO.getProviderType(), messageRecordDO.getChannel()); channelProviderConfigService.failureUpdate(messageRecordDO.getProviderType(), messageRecordDO.getChannel());