mirror of
https://github.com/hpd840321/craftlabs-authorization-sdk.git
synced 2026-06-09 10:00:30 +08:00
feat(i8-i9): webhook DEAD replay, read-only delivery status, and callback UI
I8: platform proxies replay to webhook; webhook ops token filter and internal replay endpoint; delivery service supports read/replay flows. I9: platform GET callback webhook delivery status by inbox id; UI shows read-only status block and handles load errors without blocking the page. Also refresh OpenAPI, Runbook notes, test fixtures and YAML; fix Vite dev axios baseURL so /api uses proxy; improve login error messaging. Made-with: Cursor
This commit is contained in:
+15
@@ -4,6 +4,8 @@ import cn.craftlabs.platform.api.service.CallbackInboxService;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackInboxLinkPatchRequest;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackInboxResponse;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackInboxStatusPatchRequest;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackWebhookDeliveryStatusResponse;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackWebhookReplayResponse;
|
||||
import cn.craftlabs.platform.api.web.dto.PageResponse;
|
||||
import jakarta.validation.Valid;
|
||||
import jakarta.validation.constraints.Max;
|
||||
@@ -12,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PatchMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
@@ -73,4 +76,16 @@ public class CallbackInboxController {
|
||||
@PathVariable("id") long id, @Valid @RequestBody CallbackInboxLinkPatchRequest request) {
|
||||
return callbackInboxService.patchLink(id, request);
|
||||
}
|
||||
|
||||
/** I8：代理 OPS 调用 Webhook，将关联收据的 {@code DEAD} 出库重新入队。 */
|
||||
@PostMapping("/{id}/replay-webhook-delivery")
|
||||
public CallbackWebhookReplayResponse replayWebhookDelivery(@PathVariable("id") long id) {
|
||||
return callbackInboxService.replayWebhookDelivery(id);
|
||||
}
|
||||
|
||||
/** I9：只读查询与收件箱关联的 Webhook 平台投递状态。 */
|
||||
@GetMapping("/{id}/webhook-delivery")
|
||||
public CallbackWebhookDeliveryStatusResponse getWebhookDelivery(@PathVariable("id") long id) {
|
||||
return callbackInboxService.getWebhookDeliveryStatus(id);
|
||||
}
|
||||
}
|
||||
|
||||
+63
-1
@@ -11,7 +11,10 @@ import cn.craftlabs.platform.api.persistence.project.PlatformProjectMapper;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackInboxLinkPatchRequest;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackInboxResponse;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackInboxStatusPatchRequest;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackWebhookDeliveryStatusResponse;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackWebhookReplayResponse;
|
||||
import cn.craftlabs.platform.api.web.dto.PageResponse;
|
||||
import cn.craftlabs.platform.api.webhook.WebhookDeliveryReplayClient;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -39,6 +42,7 @@ public class CallbackInboxService {
|
||||
private final PlatformContractMapper contractMapper;
|
||||
private final AuditService auditService;
|
||||
private final ObjectMapper objectMapper;
|
||||
private final WebhookDeliveryReplayClient webhookDeliveryReplayClient;
|
||||
|
||||
public CallbackInboxService(
|
||||
PlatformCallbackInboxMapper inboxMapper,
|
||||
@@ -46,13 +50,15 @@ public class CallbackInboxService {
|
||||
PlatformProjectMapper projectMapper,
|
||||
PlatformContractMapper contractMapper,
|
||||
AuditService auditService,
|
||||
ObjectMapper objectMapper) {
|
||||
ObjectMapper objectMapper,
|
||||
WebhookDeliveryReplayClient webhookDeliveryReplayClient) {
|
||||
this.inboxMapper = inboxMapper;
|
||||
this.licenseSnMapper = licenseSnMapper;
|
||||
this.projectMapper = projectMapper;
|
||||
this.contractMapper = contractMapper;
|
||||
this.auditService = auditService;
|
||||
this.objectMapper = objectMapper;
|
||||
this.webhookDeliveryReplayClient = webhookDeliveryReplayClient;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
@@ -180,6 +186,62 @@ public class CallbackInboxService {
|
||||
return toResponse(row, true);
|
||||
}
|
||||
|
||||
/** I8：按收件箱关联的 {@code webhook_receipt_id} 请求 Webhook 将 DEAD 出库重新入队。 */
|
||||
public CallbackWebhookReplayResponse replayWebhookDelivery(long inboxId) {
|
||||
PlatformCallbackInbox row = requireInbox(inboxId);
|
||||
String receiptStr = row.getWebhookReceiptId();
|
||||
if (!StringUtils.hasText(receiptStr)) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.BAD_REQUEST,
|
||||
"callback inbox has no webhookReceiptId; cannot replay platform delivery");
|
||||
}
|
||||
long receiptId;
|
||||
try {
|
||||
receiptId = Long.parseLong(receiptStr.trim());
|
||||
} catch (NumberFormatException e) {
|
||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "invalid webhookReceiptId");
|
||||
}
|
||||
if (!webhookDeliveryReplayClient.isConfigured()) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.SERVICE_UNAVAILABLE,
|
||||
"webhook replay is not configured (set LICENSE_WEBHOOK_BASE_URL and LICENSE_WEBHOOK_OPS_TOKEN)");
|
||||
}
|
||||
try {
|
||||
webhookDeliveryReplayClient.replay(receiptId);
|
||||
} catch (IllegalStateException e) {
|
||||
throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, e.getMessage());
|
||||
}
|
||||
return new CallbackWebhookReplayResponse("REQUEUED", receiptStr.trim());
|
||||
}
|
||||
|
||||
/** I9：按收件箱 {@code webhookReceiptId} 拉取 Webhook 出库行只读摘要。 */
|
||||
@Transactional(readOnly = true)
|
||||
public CallbackWebhookDeliveryStatusResponse getWebhookDeliveryStatus(long inboxId) {
|
||||
PlatformCallbackInbox row = requireInbox(inboxId);
|
||||
String receiptStr = row.getWebhookReceiptId();
|
||||
if (!StringUtils.hasText(receiptStr)) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.BAD_REQUEST,
|
||||
"callback inbox has no webhookReceiptId; no platform delivery row linked");
|
||||
}
|
||||
long receiptId;
|
||||
try {
|
||||
receiptId = Long.parseLong(receiptStr.trim());
|
||||
} catch (NumberFormatException e) {
|
||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "invalid webhookReceiptId");
|
||||
}
|
||||
if (!webhookDeliveryReplayClient.isConfigured()) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.SERVICE_UNAVAILABLE,
|
||||
"webhook ops is not configured (set LICENSE_WEBHOOK_BASE_URL and LICENSE_WEBHOOK_OPS_TOKEN)");
|
||||
}
|
||||
try {
|
||||
return webhookDeliveryReplayClient.fetchDeliveryStatus(receiptId);
|
||||
} catch (IllegalStateException e) {
|
||||
throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private PlatformCallbackInbox requireInbox(long id) {
|
||||
PlatformCallbackInbox row = inboxMapper.selectById(id);
|
||||
if (row == null) {
|
||||
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
package cn.craftlabs.platform.api.web.dto;
|
||||
|
||||
import java.time.OffsetDateTime;
|
||||
|
||||
/** I9：与 Webhook {@code GET .../platform-deliveries/by-receipt/{id}} 对齐的只读摘要。 */
|
||||
public class CallbackWebhookDeliveryStatusResponse {
|
||||
|
||||
private Long receiptId;
|
||||
private String status;
|
||||
private Integer attempts;
|
||||
private String lastError;
|
||||
private OffsetDateTime nextRetryAt;
|
||||
private OffsetDateTime updatedAt;
|
||||
|
||||
public Long getReceiptId() {
|
||||
return receiptId;
|
||||
}
|
||||
|
||||
public void setReceiptId(Long receiptId) {
|
||||
this.receiptId = receiptId;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Integer getAttempts() {
|
||||
return attempts;
|
||||
}
|
||||
|
||||
public void setAttempts(Integer attempts) {
|
||||
this.attempts = attempts;
|
||||
}
|
||||
|
||||
public String getLastError() {
|
||||
return lastError;
|
||||
}
|
||||
|
||||
public void setLastError(String lastError) {
|
||||
this.lastError = lastError;
|
||||
}
|
||||
|
||||
public OffsetDateTime getNextRetryAt() {
|
||||
return nextRetryAt;
|
||||
}
|
||||
|
||||
public void setNextRetryAt(OffsetDateTime nextRetryAt) {
|
||||
this.nextRetryAt = nextRetryAt;
|
||||
}
|
||||
|
||||
public OffsetDateTime getUpdatedAt() {
|
||||
return updatedAt;
|
||||
}
|
||||
|
||||
public void setUpdatedAt(OffsetDateTime updatedAt) {
|
||||
this.updatedAt = updatedAt;
|
||||
}
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package cn.craftlabs.platform.api.web.dto;
|
||||
|
||||
/**
|
||||
* I8：请求 Webhook 将 {@code DEAD} 出库任务重新入队后的响应。
|
||||
*/
|
||||
public class CallbackWebhookReplayResponse {
|
||||
|
||||
private String status;
|
||||
private String receiptId;
|
||||
|
||||
public CallbackWebhookReplayResponse() {}
|
||||
|
||||
public CallbackWebhookReplayResponse(String status, String receiptId) {
|
||||
this.status = status;
|
||||
this.receiptId = receiptId;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getReceiptId() {
|
||||
return receiptId;
|
||||
}
|
||||
|
||||
public void setReceiptId(String receiptId) {
|
||||
this.receiptId = receiptId;
|
||||
}
|
||||
}
|
||||
+119
@@ -0,0 +1,119 @@
|
||||
package cn.craftlabs.platform.api.webhook;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.StringUtils;
|
||||
import cn.craftlabs.platform.api.web.dto.CallbackWebhookDeliveryStatusResponse;
|
||||
import org.springframework.web.client.RestClient;
|
||||
import org.springframework.web.client.RestClientException;
|
||||
import org.springframework.web.client.RestClientResponseException;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
/**
|
||||
* I8 / I9：代 OPS 调用 {@code license-webhook-ingress}（重放与只读查询），须配置 base-url + ops-token。
|
||||
*/
|
||||
@Component
|
||||
public class WebhookDeliveryReplayClient {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(WebhookDeliveryReplayClient.class);
|
||||
/** 与 license-webhook-ingress {@code WebhookOpsTokenFilter} 请求头一致 */
|
||||
private static final String HEADER_OPS_TOKEN = "X-Webhook-Ops-Token";
|
||||
|
||||
private final RestClient restClient = RestClient.create();
|
||||
|
||||
@Value("${craftlabs.webhook.base-url:}")
|
||||
private String baseUrl;
|
||||
|
||||
@Value("${craftlabs.webhook.ops-token:}")
|
||||
private String opsToken;
|
||||
|
||||
public boolean isConfigured() {
|
||||
return StringUtils.hasText(baseUrl) && StringUtils.hasText(opsToken);
|
||||
}
|
||||
|
||||
public void replay(long receiptId) {
|
||||
if (!isConfigured()) {
|
||||
throw new IllegalStateException("webhook replay is not configured");
|
||||
}
|
||||
String url =
|
||||
baseUrl.replaceAll("/+$", "")
|
||||
+ "/internal/v1/platform-deliveries/by-receipt/"
|
||||
+ receiptId
|
||||
+ "/replay";
|
||||
try {
|
||||
restClient
|
||||
.post()
|
||||
.uri(url)
|
||||
.header(HEADER_OPS_TOKEN, opsToken)
|
||||
.retrieve()
|
||||
.toBodilessEntity();
|
||||
} catch (RestClientResponseException e) {
|
||||
throw mapException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/** I9：查询 {@code webhook_platform_delivery} 行摘要。 */
|
||||
public CallbackWebhookDeliveryStatusResponse fetchDeliveryStatus(long receiptId) {
|
||||
if (!isConfigured()) {
|
||||
throw new IllegalStateException("webhook ops client is not configured");
|
||||
}
|
||||
String url =
|
||||
baseUrl.replaceAll("/+$", "")
|
||||
+ "/internal/v1/platform-deliveries/by-receipt/"
|
||||
+ receiptId;
|
||||
try {
|
||||
return restClient
|
||||
.get()
|
||||
.uri(url)
|
||||
.header(HEADER_OPS_TOKEN, opsToken)
|
||||
.retrieve()
|
||||
.body(CallbackWebhookDeliveryStatusResponse.class);
|
||||
} catch (RestClientResponseException e) {
|
||||
throw mapException(e);
|
||||
} catch (RestClientException e) {
|
||||
throw new ResponseStatusException(
|
||||
HttpStatus.BAD_GATEWAY, "webhook unreachable: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private static ResponseStatusException mapException(RestClientResponseException e) {
|
||||
int code = e.getStatusCode().value();
|
||||
String body = e.getResponseBodyAsString(StandardCharsets.UTF_8);
|
||||
String detail = shorten(body);
|
||||
log.debug("webhook replay HTTP {} body {}", code, detail);
|
||||
if (code == HttpStatus.NOT_FOUND.value()) {
|
||||
return new ResponseStatusException(
|
||||
HttpStatus.NOT_FOUND, "webhook platform delivery not found for receipt");
|
||||
}
|
||||
if (code == HttpStatus.CONFLICT.value()) {
|
||||
return new ResponseStatusException(
|
||||
HttpStatus.CONFLICT,
|
||||
StringUtils.hasText(detail)
|
||||
? detail
|
||||
: "webhook rejected replay (delivery is not DEAD or conflict)");
|
||||
}
|
||||
if (code == HttpStatus.SERVICE_UNAVAILABLE.value()) {
|
||||
return new ResponseStatusException(
|
||||
HttpStatus.SERVICE_UNAVAILABLE,
|
||||
StringUtils.hasText(detail) ? detail : "webhook ops endpoint unavailable");
|
||||
}
|
||||
if (code == HttpStatus.UNAUTHORIZED.value()) {
|
||||
return new ResponseStatusException(
|
||||
HttpStatus.BAD_GATEWAY, "webhook rejected ops token (check LICENSE_WEBHOOK_OPS_TOKEN)");
|
||||
}
|
||||
return new ResponseStatusException(HttpStatus.BAD_GATEWAY, "webhook replay failed: HTTP " + code);
|
||||
}
|
||||
|
||||
private static String shorten(String body) {
|
||||
if (!StringUtils.hasText(body)) {
|
||||
return "";
|
||||
}
|
||||
String t = body.trim();
|
||||
return t.length() > 400 ? t.substring(0, 400) + "…" : t;
|
||||
}
|
||||
}
|
||||
@@ -33,6 +33,12 @@ platform:
|
||||
internal:
|
||||
token: ${PLATFORM_INTERNAL_TOKEN:${CRAFTLABS_PLATFORM_INTERNAL_TOKEN:}}
|
||||
|
||||
# I8：平台代调 Webhook 出库重放（OPS JWT → 平台 → Webhook 内部 API）
|
||||
craftlabs:
|
||||
webhook:
|
||||
base-url: ${LICENSE_WEBHOOK_BASE_URL:}
|
||||
ops-token: ${LICENSE_WEBHOOK_OPS_TOKEN:}
|
||||
|
||||
springdoc:
|
||||
swagger-ui:
|
||||
path: /swagger-ui.html
|
||||
|
||||
Reference in New Issue
Block a user