diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReq.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReq.java index 02aa430..344dbb3 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReq.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReq.java @@ -30,4 +30,8 @@ public class WebhookReq { @Column(name = "SECRET", length = 200) @Comment("HMAC 서명용 Secret Key") private String secret; + + @Column(name = "USER_SECRET", length = 200) + @Comment("사용자 Secret Key") + private String userSecret; } diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/controller/WebhookSendController.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/controller/WebhookSendController.java index eaac82b..ec74eae 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/controller/WebhookSendController.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/controller/WebhookSendController.java @@ -63,9 +63,10 @@ public class WebhookSendController { */ @PostMapping("/receive") public ResponseEntity> receiveWebhook( - @RequestHeader(value = "X-Webhook-Signature", required = false) String signature, - @RequestHeader(value = "X-Webhook-Event", required = false) String eventType, - @RequestHeader(value = "X-Webhook-Timestamp", required = false) String timestamp, + @RequestHeader(value = "x-webhook-signature", required = false) String signature, + @RequestHeader(value = "x-webhook-event", required = false) String eventType, + @RequestHeader(value = "x-webhook-secret", required = false) String secret, + @RequestHeader(value = "x-webhook-timestamp", required = false) String timestamp, @RequestBody String rawPayload) { log.info("[Webhook] 수신 - eventType: {}, timestamp: {}", eventType, timestamp); diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookPayload.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookPayload.java index c3e040d..c5cd3ad 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookPayload.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookPayload.java @@ -17,13 +17,15 @@ public class WebhookPayload { private String eventType; private String eventId; + private String message; private long timestamp; private Object data; - public static WebhookPayload of(String eventType, Object data) { + public static WebhookPayload of(String eventType, String message, Object data) { return WebhookPayload.builder() .eventType(eventType) .eventId(UUID.randomUUID().toString()) + .message(message) .timestamp(System.currentTimeMillis()) .data(data) .build();