格式修改

event-bridge-service/src/main/java/com/baiyue/eventbridge/security/InternalServiceTokenGuard.java

@@ -13,11 +13,8 @@ import java.security.MessageDigest;
  */
 @Component
 public class InternalServiceTokenGuard {
-    private final String expectedToken;
-
-    public InternalServiceTokenGuard(@Value("${baiyue.security.internal-service-token:}") String expectedToken) {
-        this.expectedToken = expectedToken;
-    }
+    @Value("${baiyue.security.internal-service-token:}")
+    private String expectedToken;
 
     public void verify(String actualToken) {
         if (expectedToken == null || expectedToken.isBlank()) {

event-bridge-service/src/main/java/com/baiyue/eventbridge/service/EventInboxService.java

@@ -1,5 +1,7 @@
 package com.baiyue.eventbridge.service;
 
+import jakarta.annotation.Resource;
+
 import com.baiyue.common.event.EventEnvelope;
 import com.baiyue.common.event.EventPayloadCanonicalizer;
 import com.baiyue.common.event.EventPayloadHash;
@@ -19,16 +21,12 @@ import java.time.LocalDateTime;
  */
 @Service
 public class EventInboxService {
-    private final InboxStore inboxStore;
-    private final ObjectMapper objectMapper;
-    private final String localRegion;
-
-    public EventInboxService(InboxStore inboxStore, ObjectMapper objectMapper,
-                             @Value("${baiyue.region:CN}") String localRegion) {
-        this.inboxStore = inboxStore;
-        this.objectMapper = objectMapper;
-        this.localRegion = localRegion;
-    }
+    @Resource
+    private InboxStore inboxStore;
+    @Resource
+    private ObjectMapper objectMapper;
+    @Value("${baiyue.region:CN}")
+    private  String localRegion;
 
     @Transactional
     public EventReceiveResult receive(EventEnvelope envelope) {

event-bridge-service/src/main/resources/application.yml

@@ -43,6 +43,6 @@ logging:
     rollingpolicy:
       file-name-pattern: "${LOGGING_ROLLING_FILE_NAME_PATTERN:${LOG_PATH:./logs}/${spring.application.name}.%d{yyyy-MM-dd}.%i.log.gz}"
       max-file-size: "${LOGGING_ROLLING_MAX_FILE_SIZE:100MB}"
-      max-history: "${LOGGING_ROLLING_MAX_HISTORY:30}"
+      max-history: "${LOGGING_ROLLING_MAX_HISTORY:7}"
       total-size-cap: "${LOGGING_ROLLING_TOTAL_SIZE_CAP:5GB}"
       clean-history-on-start: "${LOGGING_ROLLING_CLEAN_HISTORY_ON_START:false}"

event-bridge-service/src/test/java/com/baiyue/eventbridge/security/InternalServiceTokenGuardTest.java

@@ -2,22 +2,34 @@ package com.baiyue.eventbridge.security;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.AfterEach;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.server.ResponseStatusException;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @DisplayName("内部服务令牌校验")
+@SpringJUnitConfig(InternalServiceTokenGuard.class)
+@TestPropertySource(properties = "baiyue.security.internal-service-token=a-secure-internal-token")
 class InternalServiceTokenGuardTest {
+    @Resource private InternalServiceTokenGuard guard;
+
+    @AfterEach
+    void resetToken() {
+        ReflectionTestUtils.setField(guard, "expectedToken", "a-secure-internal-token");
+    }
     @Test
     void validTokenAllowsAccess() {
-        InternalServiceTokenGuard guard = new InternalServiceTokenGuard("a-secure-internal-token");
         assertThatCode(() -> guard.verify("a-secure-internal-token")).doesNotThrowAnyException();
     }
 
     @Test
     void unconfiguredTokenDisablesReceiveEndpoint() {
-        InternalServiceTokenGuard guard = new InternalServiceTokenGuard("");
+        ReflectionTestUtils.setField(guard, "expectedToken", "");
         assertThatThrownBy(() -> guard.verify("anything"))
                 .isInstanceOf(ResponseStatusException.class)
                 .hasMessageContaining("接口已关闭");
@@ -25,7 +37,7 @@ class InternalServiceTokenGuardTest {
 
     @Test
     void invalidTokenIsRejected() {
-        InternalServiceTokenGuard guard = new InternalServiceTokenGuard("expected");
+        ReflectionTestUtils.setField(guard, "expectedToken", "expected");
         assertThatThrownBy(() -> guard.verify("wrong"))
                 .isInstanceOf(ResponseStatusException.class)
                 .hasMessageContaining("令牌无效");

event-bridge-service/src/test/java/com/baiyue/eventbridge/service/EventInboxServiceTest.java

@@ -6,9 +6,17 @@ import com.baiyue.common.event.EventPayloadHash;
 import com.baiyue.common.event.RegionCode;
 import com.baiyue.eventbridge.domain.BridgeInbox;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.Resource;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -22,10 +30,28 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 @DisplayName("跨区域事件收件箱")
+@SpringJUnitConfig(classes = {EventInboxService.class, EventInboxServiceTest.TestConfig.class})
+@TestPropertySource(properties = "baiyue.region=OVERSEAS")
 class EventInboxServiceTest {
-    private final ObjectMapper objectMapper = new ObjectMapper();
-    private final InboxStore store = mock(InboxStore.class);
-    private final EventInboxService service = new EventInboxService(store, objectMapper, "OVERSEAS");
+    @Resource
+    private ObjectMapper objectMapper;
+    @MockBean
+    private InboxStore store;
+    @Resource
+    private EventInboxService service;
+
+    @Configuration(proxyBeanMethods = false)
+    static class TestConfig {
+        @Bean
+        ObjectMapper objectMapper() {
+            return new ObjectMapper();
+        }
+    }
+
+    @AfterEach
+    void resetRegion() {
+        ReflectionTestUtils.setField(service, "localRegion", "OVERSEAS");
+    }
 
     @Test
     void firstEventPersistsAndReturnsReceived() {
@@ -66,10 +92,10 @@ class EventInboxServiceTest {
 
     @Test
     void targetRegionDifferentFromCurrentDeploymentIsRejected() {
-        EventInboxService cnService = new EventInboxService(store, objectMapper, "CN");
+        ReflectionTestUtils.setField(service, "localRegion", "CN");
         EventEnvelope envelope = withHash(envelope("sha256:placeholder"));
 
-        assertThatThrownBy(() -> cnService.receive(envelope))
+        assertThatThrownBy(() -> service.receive(envelope))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessageContaining("目标区域");
     }