From 4ed1070a37ff110af7b50585a70590a05072d8f0 Mon Sep 17 00:00:00 2001
From: hyojin kim <hjkim4@gcsc.co.kr>
Date: Thu, 27 Nov 2025 22:20:21 +0900
Subject: [PATCH] Merge branch 'dev_ship_movement' into dev_ship_detail

# Conflicts:
#	src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java
---
 .../config/MaritimeApiWebClientConfig.java      | 17 +++++++++--------
 .../batch/config/ShipMovementJobConfig.java     |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java b/src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java
index c48b750..4f0d7f9 100644
--- a/src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java
+++ b/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()
diff --git a/src/main/java/com/snp/batch/jobs/shipMovement/batch/config/ShipMovementJobConfig.java b/src/main/java/com/snp/batch/jobs/shipMovement/batch/config/ShipMovementJobConfig.java
index 8709ba0..674a579 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovement/batch/config/ShipMovementJobConfig.java
+++ b/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;