优化
This commit is contained in:
@@ -21,6 +21,7 @@ baiyue:
|
|||||||
emc-automated: ${EMC_TRACKING_ENABLED:false}
|
emc-automated: ${EMC_TRACKING_ENABLED:false}
|
||||||
hede-automated: ${HEDE_TRACKING_ENABLED:false}
|
hede-automated: ${HEDE_TRACKING_ENABLED:false}
|
||||||
scheduler:
|
scheduler:
|
||||||
|
enabled: ${CARRIER_SCHEDULE_SCHEDULER_ENABLED:false}
|
||||||
zone: ${CARRIER_SCHEDULE_ZONE:Asia/Shanghai}
|
zone: ${CARRIER_SCHEDULE_ZONE:Asia/Shanghai}
|
||||||
scan-fixed-delay: ${CARRIER_SCHEDULE_SCAN_FIXED_DELAY:PT1M}
|
scan-fixed-delay: ${CARRIER_SCHEDULE_SCAN_FIXED_DELAY:PT1M}
|
||||||
scan-initial-delay: ${CARRIER_SCHEDULE_SCAN_INITIAL_DELAY:PT10S}
|
scan-initial-delay: ${CARRIER_SCHEDULE_SCAN_INITIAL_DELAY:PT10S}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ baiyue.carrier-schedule.providers.cosco-official-api-enabled: ${COSCO_OPEN_API_E
|
|||||||
baiyue.carrier-schedule.providers.emc-automated: ${EMC_TRACKING_ENABLED:false}
|
baiyue.carrier-schedule.providers.emc-automated: ${EMC_TRACKING_ENABLED:false}
|
||||||
baiyue.carrier-schedule.providers.hede-automated: ${HEDE_TRACKING_ENABLED:false}
|
baiyue.carrier-schedule.providers.hede-automated: ${HEDE_TRACKING_ENABLED:false}
|
||||||
baiyue.carrier-schedule.scheduler.zone: ${CARRIER_SCHEDULE_ZONE:Asia/Shanghai}
|
baiyue.carrier-schedule.scheduler.zone: ${CARRIER_SCHEDULE_ZONE:Asia/Shanghai}
|
||||||
|
baiyue.carrier-schedule.scheduler.enabled: ${CARRIER_SCHEDULE_SCHEDULER_ENABLED:false}
|
||||||
baiyue.carrier-schedule.scheduler.scan-fixed-delay: ${CARRIER_SCHEDULE_SCAN_FIXED_DELAY:PT1M}
|
baiyue.carrier-schedule.scheduler.scan-fixed-delay: ${CARRIER_SCHEDULE_SCAN_FIXED_DELAY:PT1M}
|
||||||
baiyue.carrier-schedule.scheduler.scan-initial-delay: ${CARRIER_SCHEDULE_SCAN_INITIAL_DELAY:PT10S}
|
baiyue.carrier-schedule.scheduler.scan-initial-delay: ${CARRIER_SCHEDULE_SCAN_INITIAL_DELAY:PT10S}
|
||||||
baiyue.carrier-schedule.scheduler.batch-size: ${CARRIER_SCHEDULE_BATCH_SIZE:20}
|
baiyue.carrier-schedule.scheduler.batch-size: ${CARRIER_SCHEDULE_BATCH_SIZE:20}
|
||||||
|
|||||||
@@ -96,6 +96,7 @@ services:
|
|||||||
COSCO_OPEN_API_ENABLED: ${COSCO_OPEN_API_ENABLED:-false}
|
COSCO_OPEN_API_ENABLED: ${COSCO_OPEN_API_ENABLED:-false}
|
||||||
EMC_TRACKING_ENABLED: ${EMC_TRACKING_ENABLED:-false}
|
EMC_TRACKING_ENABLED: ${EMC_TRACKING_ENABLED:-false}
|
||||||
HEDE_TRACKING_ENABLED: ${HEDE_TRACKING_ENABLED:-false}
|
HEDE_TRACKING_ENABLED: ${HEDE_TRACKING_ENABLED:-false}
|
||||||
|
CARRIER_SCHEDULE_SCHEDULER_ENABLED: ${CARRIER_SCHEDULE_SCHEDULER_ENABLED:-false}
|
||||||
CARRIER_SCHEDULE_ZONE: ${CARRIER_SCHEDULE_ZONE:-Asia/Shanghai}
|
CARRIER_SCHEDULE_ZONE: ${CARRIER_SCHEDULE_ZONE:-Asia/Shanghai}
|
||||||
CARRIER_SCHEDULE_SCAN_FIXED_DELAY: ${CARRIER_SCHEDULE_SCAN_FIXED_DELAY:-PT1M}
|
CARRIER_SCHEDULE_SCAN_FIXED_DELAY: ${CARRIER_SCHEDULE_SCAN_FIXED_DELAY:-PT1M}
|
||||||
CARRIER_SCHEDULE_SCAN_INITIAL_DELAY: ${CARRIER_SCHEDULE_SCAN_INITIAL_DELAY:-PT10S}
|
CARRIER_SCHEDULE_SCAN_INITIAL_DELAY: ${CARRIER_SCHEDULE_SCAN_INITIAL_DELAY:-PT10S}
|
||||||
|
|||||||
+2
@@ -6,6 +6,7 @@ import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ProviderObs
|
|||||||
import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ProviderExceptionRequest;
|
import com.baiyue.firstleg.portschedule.dto.CarrierScheduleQueryDtos.ProviderExceptionRequest;
|
||||||
import com.baiyue.firstleg.portschedule.entity.CarrierScheduleQueryEntity;
|
import com.baiyue.firstleg.portschedule.entity.CarrierScheduleQueryEntity;
|
||||||
import com.baiyue.firstleg.portschedule.repository.CarrierScheduleQueryRepository;
|
import com.baiyue.firstleg.portschedule.repository.CarrierScheduleQueryRepository;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.scheduling.annotation.Scheduled;
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@@ -18,6 +19,7 @@ import java.util.List;
|
|||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
|
@ConditionalOnProperty(prefix = "baiyue.carrier-schedule.scheduler", name = "enabled", havingValue = "true")
|
||||||
public class CarrierScheduleQueryScheduler {
|
public class CarrierScheduleQueryScheduler {
|
||||||
private final CarrierScheduleQueryRepository repository;
|
private final CarrierScheduleQueryRepository repository;
|
||||||
private final CarrierScheduleQueryService service;
|
private final CarrierScheduleQueryService service;
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ baiyue:
|
|||||||
emc-automated: ${EMC_TRACKING_ENABLED:false}
|
emc-automated: ${EMC_TRACKING_ENABLED:false}
|
||||||
hede-automated: ${HEDE_TRACKING_ENABLED:false}
|
hede-automated: ${HEDE_TRACKING_ENABLED:false}
|
||||||
scheduler:
|
scheduler:
|
||||||
|
enabled: ${CARRIER_SCHEDULE_SCHEDULER_ENABLED:false}
|
||||||
zone: ${CARRIER_SCHEDULE_ZONE:Asia/Shanghai}
|
zone: ${CARRIER_SCHEDULE_ZONE:Asia/Shanghai}
|
||||||
scan-fixed-delay: ${CARRIER_SCHEDULE_SCAN_FIXED_DELAY:PT1M}
|
scan-fixed-delay: ${CARRIER_SCHEDULE_SCAN_FIXED_DELAY:PT1M}
|
||||||
scan-initial-delay: ${CARRIER_SCHEDULE_SCAN_INITIAL_DELAY:PT10S}
|
scan-initial-delay: ${CARRIER_SCHEDULE_SCAN_INITIAL_DELAY:PT10S}
|
||||||
|
|||||||
+13
@@ -4,6 +4,7 @@ import com.baiyue.firstleg.client.CarrierScheduleIntegrationClient;
|
|||||||
import com.baiyue.firstleg.portschedule.entity.CarrierScheduleQueryEntity;
|
import com.baiyue.firstleg.portschedule.entity.CarrierScheduleQueryEntity;
|
||||||
import com.baiyue.firstleg.portschedule.repository.CarrierScheduleQueryRepository;
|
import com.baiyue.firstleg.portschedule.repository.CarrierScheduleQueryRepository;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.scheduling.annotation.Scheduled;
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
import org.springframework.test.util.ReflectionTestUtils;
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
|
|
||||||
@@ -27,6 +28,18 @@ import static org.mockito.Mockito.when;
|
|||||||
import static org.mockito.Mockito.never;
|
import static org.mockito.Mockito.never;
|
||||||
|
|
||||||
class CarrierScheduleQuerySchedulerTest {
|
class CarrierScheduleQuerySchedulerTest {
|
||||||
|
@Test
|
||||||
|
void isDisabledUnlessTheAutomaticSchedulerIsExplicitlyEnabled() {
|
||||||
|
ConditionalOnProperty condition = CarrierScheduleQueryScheduler.class
|
||||||
|
.getAnnotation(ConditionalOnProperty.class);
|
||||||
|
|
||||||
|
assertThat(condition).isNotNull();
|
||||||
|
assertThat(condition.prefix()).isEqualTo("baiyue.carrier-schedule.scheduler");
|
||||||
|
assertThat(condition.name()).containsExactly("enabled");
|
||||||
|
assertThat(condition.havingValue()).isEqualTo("true");
|
||||||
|
assertThat(condition.matchIfMissing()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void declaresOneConfigurableDueScannerRatherThanDirectCarrierCronCalls() throws Exception {
|
void declaresOneConfigurableDueScannerRatherThanDirectCarrierCronCalls() throws Exception {
|
||||||
Scheduled[] schedules = CarrierScheduleQueryScheduler.class.getMethod("poll").getAnnotationsByType(Scheduled.class);
|
Scheduled[] schedules = CarrierScheduleQueryScheduler.class.getMethod("poll").getAnnotationsByType(Scheduled.class);
|
||||||
|
|||||||
Reference in New Issue
Block a user