diff --git a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/client/sender/impl/TelecomSmsSender.java b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/client/sender/impl/TelecomSmsSender.java index c643636..500168e 100644 --- a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/client/sender/impl/TelecomSmsSender.java +++ b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/client/sender/impl/TelecomSmsSender.java @@ -127,7 +127,7 @@ public class TelecomSmsSender implements SmsSender { this.getDownInfo(mid); this.scheduledExecutorService.shutdown(); this.scheduledExecutorService = null; - }, 2, TimeUnit.SECONDS); + }, 10, TimeUnit.SECONDS); return true; } else { ProviderErrorCodeMappingDO providerErrorCodeMappingDO = this.sender.providerErrorCodeMappingService.getByProviderErrorCode(message.getProviderType(), message.getChannel(), telecomSmsSendResponse.list.get(0).result + ""); @@ -217,7 +217,7 @@ public class TelecomSmsSender implements SmsSender { headers, String.class ); - System.out.println(JSON.toJSONString(response.getBody())); + System.out.println(JSON.toJSONString(JSON.toJSONString(response))); if (response.getStatusCode() == HttpStatus.OK) { TelecomSmsSelectResponse telecomSmsSelectResponse = JSON.parseObject(response.getBody(), TelecomSmsSelectResponse.class); diff --git a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/controller/admin/channel/ChannelProviderConfigController.java b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/controller/admin/channel/ChannelProviderConfigController.java index fe1a071..061ce53 100644 --- a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/controller/admin/channel/ChannelProviderConfigController.java +++ b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/controller/admin/channel/ChannelProviderConfigController.java @@ -31,6 +31,7 @@ import java.util.Map; import static com.njcn.msgpush.framework.common.pojo.CommonResult.success; + @Tag(name = "管理后台 - 渠道服务商") @Slf4j @Validated diff --git a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/dataobject/retry/MessageRetryHistoryDO.java b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/dataobject/retry/MessageRetryHistoryDO.java index 1eb1075..93df1bc 100644 --- a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/dataobject/retry/MessageRetryHistoryDO.java +++ b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/dataobject/retry/MessageRetryHistoryDO.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * @data 2026-03-04 */ @Data -@TableName("push_message_retry_queue") +@TableName("push_message_retry_history") @EqualsAndHashCode(callSuper = true) public class MessageRetryHistoryDO extends BaseDO { private Integer id; diff --git a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/service/retry/MessageRetryHistoryServiceImpl.java b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/service/retry/MessageRetryHistoryServiceImpl.java index 4fb733a..5291b9b 100644 --- a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/service/retry/MessageRetryHistoryServiceImpl.java +++ b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/service/retry/MessageRetryHistoryServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; public class MessageRetryHistoryServiceImpl extends ServiceImpl implements MessageRetryHistoryService { @Override public boolean add(MessageRetryHistoryDO messageRetryHistoryDO) { - return this.add(messageRetryHistoryDO); + return this.save(messageRetryHistoryDO); } public Integer getMaxRetrySequence(String messageId) {