修复启动报错

shaofan
1 parent f3db296c
Showing 2 changed files with 37 additions and 13 deletions
src/main/java/com/diligrp/rider/service/impl/WebhookServiceImpl.java
src/main/java/com/diligrp/rider/task/WebhookRetryTask.java
@@ -13,7 +13,6 @@ import com.diligrp.rider.util.SignUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
  
 import java.net.URI;
@@ -76,18 +75,6 @@ public class WebhookServiceImpl implements WebhookService {
         retry(log);
     }
  
-    @Scheduled(fixedDelay = 300_000)
-    public void retryFailedWebhooks() {
-        List<WebhookLog> logs = webhookLogMapper.selectList(new LambdaQueryWrapper<WebhookLog>()
-                .eq(WebhookLog::getStatus, 0)
-                .lt(WebhookLog::getRetryCount, 5)
-                .orderByAsc(WebhookLog::getCreateTime)
-                .last("LIMIT 20"));
-        for (WebhookLog log : logs) {
-            retry(log);
-        }
-    }
-
     private void retry(WebhookLog webhookLog) {
         OpenApp app = openAppMapper.selectById(webhookLog.getAppId());
         if (app == null) return;
+package com.diligrp.rider.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.diligrp.rider.entity.WebhookLog;
+import com.diligrp.rider.mapper.WebhookLogMapper;
+import com.diligrp.rider.service.WebhookService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class WebhookRetryTask {
+
+    private final WebhookLogMapper webhookLogMapper;
+    private final WebhookService webhookService;
+
+    @Scheduled(fixedDelay = 300_000)
+    public void retryFailedWebhooks() {
+        List<WebhookLog> logs = webhookLogMapper.selectList(new LambdaQueryWrapper<WebhookLog>()
+                .eq(WebhookLog::getStatus, 0)
+                .lt(WebhookLog::getRetryCount, 5)
+                .orderByAsc(WebhookLog::getCreateTime)
+                .last("LIMIT 20"));
+        for (WebhookLog webhookLog : logs) {
+            try {
+                webhookService.retry(webhookLog.getId());
+            } catch (Exception e) {
+                log.warn("Webhook 自动重试失败 logId={}", webhookLog.getId(), e);
+            }
+        }
+    }
+}