gc/snp-batch-validation
1
0
포크 0
코드 이슈 풀 리퀘스트 위키 활동

Merge branch 'dev_ship_movement' into dev_ship_detail

소스 검색 
# Conflicts:
#	src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java
This commit is contained in:
hyojin kim 2025-11-27 22:20:21 +09:00
부모 e44637e1f3
커밋 4ed1070a37
2개의 변경된 파일과 10개의 추가작업 그리고 9개의 파일을 삭제
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java
파일 보기

@ -29,11 +29,12 @@ public class MaritimeApiWebClientConfig {
@Value("${app.batch.ship-api.url}")
private String maritimeApiUrl;
@Value("https://aisapi.maritime.spglobal.com")
@Value("${app.batch.ais-api.url}")
private String maritimeAisApiUrl;
@Value("https://webservices.maritime.spglobal.com")
private String maritimeWebSerivcesUrl;
@Value("${app.batch.webservice-api.url}")
private String maritimeServiceApiUrl;
@Value("${app.batch.ship-api.username}")
private String maritimeApiUsername;
@ -83,15 +84,15 @@ public class MaritimeApiWebClientConfig {
.build();
}
@Bean(name = "maritimeWebServicesWebClient")
public WebClient maritimeWebServicesWebClient(){
@Bean(name = "maritimeServiceApiWebClient")
public WebClient maritimeServiceApiWebClient(){
log.info("========================================");
log.info("Maritime WebSerivces WebClient 생성");
log.info("Base URL: {}", maritimeWebSerivcesUrl);
log.info("Maritime AIS API WebClient 생성");
log.info("Base URL: {}", maritimeServiceApiUrl);
log.info("========================================");
return WebClient.builder()
.baseUrl(maritimeWebSerivcesUrl)
.baseUrl(maritimeServiceApiUrl)
.defaultHeaders(headers -> headers.setBasicAuth(maritimeApiUsername, maritimeApiPassword))
.codecs(configurer -> configurer
.defaultCodecs()

2
src/main/java/com/snp/batch/jobs/shipMovement/batch/config/ShipMovementJobConfig.java
파일 보기

@ -60,7 +60,7 @@ public class ShipMovementJobConfig extends BaseJobConfig<PortCallDto, ShipMoveme
PlatformTransactionManager transactionManager,
ShipMovementProcessor shipMovementProcessor,
ShipMovementWriter shipMovementWriter, JdbcTemplate jdbcTemplate,
@Qualifier("maritimeWebServicesWebClient") WebClient maritimeApiWebClient,
@Qualifier("maritimeServiceApiWebClient") WebClient maritimeApiWebClient,
ObjectMapper objectMapper) { // ObjectMapper 주입 추가
super(jobRepository, transactionManager);
this.shipMovementProcessor = shipMovementProcessor;