fix: prioritize domestic bridge endpoint
This commit is contained in:
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
|
|||||||
|
|
||||||
/** 将海外业务 Outbox 投递到国内区域事件桥。 */
|
/** 将海外业务 Outbox 投递到国内区域事件桥。 */
|
||||||
@FeignClient(name = "event-bridge-service", contextId = "overseasContainerEventBridgeClient",
|
@FeignClient(name = "event-bridge-service", contextId = "overseasContainerEventBridgeClient",
|
||||||
url = "${baiyue.firstleg.event-bridge-url:}")
|
url = "${CN_EVENT_BRIDGE_URL:${baiyue.firstleg.event-bridge-url:}}")
|
||||||
public interface EventBridgeClient {
|
public interface EventBridgeClient {
|
||||||
@PostMapping("/internal/event-bridge/events")
|
@PostMapping("/internal/event-bridge/events")
|
||||||
ApiResponse<Acknowledgement> receive(
|
ApiResponse<Acknowledgement> receive(
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ baiyue:
|
|||||||
event-bridge:
|
event-bridge:
|
||||||
url: ${CN_EVENT_BRIDGE_URL:${FIRSTLEG_EVENT_BRIDGE_URL:}}
|
url: ${CN_EVENT_BRIDGE_URL:${FIRSTLEG_EVENT_BRIDGE_URL:}}
|
||||||
firstleg:
|
firstleg:
|
||||||
event-bridge-url: ${FIRSTLEG_EVENT_BRIDGE_URL:}
|
event-bridge-url: ${CN_EVENT_BRIDGE_URL:${FIRSTLEG_EVENT_BRIDGE_URL:}}
|
||||||
outbox-relay:
|
outbox-relay:
|
||||||
fixed-delay-ms: ${FIRSTLEG_OUTBOX_RELAY_FIXED_DELAY_MS:5000}
|
fixed-delay-ms: ${FIRSTLEG_OUTBOX_RELAY_FIXED_DELAY_MS:5000}
|
||||||
lease-seconds: ${FIRSTLEG_OUTBOX_RELAY_LEASE_SECONDS:60}
|
lease-seconds: ${FIRSTLEG_OUTBOX_RELAY_LEASE_SECONDS:60}
|
||||||
|
|||||||
+16
@@ -0,0 +1,16 @@
|
|||||||
|
package com.baiyue.lastleg.client;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
|
class EventBridgeClientContractTest {
|
||||||
|
@Test
|
||||||
|
void canonicalDomesticBridgeEnvironmentOverridesLegacyNacosProperty() {
|
||||||
|
FeignClient contract = EventBridgeClient.class.getAnnotation(FeignClient.class);
|
||||||
|
|
||||||
|
assertThat(contract.url())
|
||||||
|
.isEqualTo("${CN_EVENT_BRIDGE_URL:${baiyue.firstleg.event-bridge-url:}}");
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user