diff --git a/src/GPKI/certs/SVR4050159001_env.cer b/src/GPKI/certs/SVR4050159001_env.cer new file mode 100644 index 0000000..4b4d1a5 Binary files /dev/null and b/src/GPKI/certs/SVR4050159001_env.cer differ diff --git a/src/GPKI/certs/SVR5640020001_env.cer b/src/GPKI/certs/SVR5640020001_env.cer new file mode 100644 index 0000000..2adaf28 Binary files /dev/null and b/src/GPKI/certs/SVR5640020001_env.cer differ diff --git a/src/GPKI/certs/SVR5640020001_env.key b/src/GPKI/certs/SVR5640020001_env.key new file mode 100644 index 0000000..ee7a77e Binary files /dev/null and b/src/GPKI/certs/SVR5640020001_env.key differ diff --git a/src/GPKI/certs/SVR5640020001_sig.cer b/src/GPKI/certs/SVR5640020001_sig.cer new file mode 100644 index 0000000..1ebac8a Binary files /dev/null and b/src/GPKI/certs/SVR5640020001_sig.cer differ diff --git a/src/GPKI/certs/SVR5640020001_sig.key b/src/GPKI/certs/SVR5640020001_sig.key new file mode 100644 index 0000000..53ae4a7 Binary files /dev/null and b/src/GPKI/certs/SVR5640020001_sig.key differ diff --git a/src/main/java/com/vmis/interfaceapp/config/HttpClientConfig.java b/src/main/java/com/vmis/interfaceapp/config/HttpClientConfig.java index 5d24686..a44b1bf 100644 --- a/src/main/java/com/vmis/interfaceapp/config/HttpClientConfig.java +++ b/src/main/java/com/vmis/interfaceapp/config/HttpClientConfig.java @@ -39,8 +39,6 @@ public class HttpClientConfig { HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient); return builder .requestFactory(() -> requestFactory) - .setConnectTimeout(Duration.ofMillis(connectTimeout)) - .setReadTimeout(Duration.ofMillis(readTimeout)) .build(); } } diff --git a/src/main/java/com/vmis/interfaceapp/controller/VehicleInterfaceController.java b/src/main/java/com/vmis/interfaceapp/controller/VehicleInterfaceController.java index a60b47c..1da1cfd 100644 --- a/src/main/java/com/vmis/interfaceapp/controller/VehicleInterfaceController.java +++ b/src/main/java/com/vmis/interfaceapp/controller/VehicleInterfaceController.java @@ -9,6 +9,8 @@ import com.vmis.interfaceapp.model.ledger.LedgerResponse; import com.vmis.interfaceapp.service.RequestEnricher; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -46,6 +48,8 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("/api/v1/vehicles") +@RequiredArgsConstructor +@Slf4j @Tag(name = "Vehicle Interfaces", description = "시군구연계 자동차 정보 연계 API") public class VehicleInterfaceController { @@ -68,25 +72,6 @@ public class VehicleInterfaceController { */ private final GovernmentApiClient govClient; - /** - * 생성자를 통한 의존성 주입 - * - *

Spring Framework의 생성자 주입 방식을 사용합니다. - * 이 방식은 다음과 같은 장점을 제공합니다:

- * - * - * @param govClient 정부 API와 통신하는 클라이언트 객체 - */ - public VehicleInterfaceController(GovernmentApiClient govClient, RequestEnricher enricher) { - this.govClient = govClient; - this.enricher = enricher; - } - /** * 자동차 기본사항 조회 API * diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 18c5ae7..324dffa 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -18,14 +18,14 @@ vmis: certServerId: "SVR5640020001" targetServerId: "SVR1500000015" ldap: true - gpkiLicPath: "C:/gpki2/gpkisecureweb/conf" - certFilePath: "C:/gpki2/gpkisecureweb/certs" - envCertFilePathName: "C:/gpki2/gpkisecureweb/certs/SVR5640020001_env.cer" - envPrivateKeyFilePathName: "C:/gpki2/gpkisecureweb/certs/SVR5640020001_env.key" - envPrivateKeyPasswd: "change-me-dev" - sigCertFilePathName: "C:/gpki2/gpkisecureweb/certs/SVR5640020001_sig.cer" - sigPrivateKeyFilePathName: "C:/gpki2/gpkisecureweb/certs/SVR5640020001_sig.key" - sigPrivateKeyPasswd: "change-me-dev" + gpkiLicPath: "src/GPKI/conf" + certFilePath: "src/GPKI/certs" + envCertFilePathName: "src/GPKI/certs/SVR5640020001_env.cer" + envPrivateKeyFilePathName: "src/GPKI/certs/SVR5640020001_env.key" + envPrivateKeyPasswd: "*sbm204221" + sigCertFilePathName: "src/GPKI/certs/SVR5640020001_sig.cer" + sigPrivateKeyFilePathName: "src/GPKI/certs/SVR5640020001_sig.key" + sigPrivateKeyPasswd: "*sbm204221" gov: scheme: "http" host: "10.188.225.94:29001" # 개발(DEV) 행정망 diff --git a/src/main/resources/application-prd.yml b/src/main/resources/application-prd.yml index d771f24..f068437 100644 --- a/src/main/resources/application-prd.yml +++ b/src/main/resources/application-prd.yml @@ -15,14 +15,14 @@ vmis: certServerId: "SVR5640020001" # 운영 인증서 ID로 교체 targetServerId: "SVR1500000015" ldap: true - gpkiLicPath: "C:/gpki2/gpkisecureweb/conf" - certFilePath: "C:/gpki2/gpkisecureweb/certs" - envCertFilePathName: "C:/gpki2/gpkisecureweb/certs/SVR5640020001_env.cer" - envPrivateKeyFilePathName: "C:/gpki2/gpkisecureweb/certs/SVR5640020001_env.key" - envPrivateKeyPasswd: "change-me-prd" - sigCertFilePathName: "C:/gpki2/gpkisecureweb/certs/SVR5640020001_sig.cer" - sigPrivateKeyFilePathName: "C:/gpki2/gpkisecureweb/certs/SVR5640020001_sig.key" - sigPrivateKeyPasswd: "change-me-prd" + gpkiLicPath: "src/GPKI/conf" + certFilePath: "src/GPKI/certs" + envCertFilePathName: "src/GPKI/certs/SVR5640020001_env.cer" + envPrivateKeyFilePathName: "src/GPKI/certs/SVR5640020001_env.key" + envPrivateKeyPasswd: "*sbm204221" + sigCertFilePathName: "src/GPKI/certs/SVR5640020001_sig.cer" + sigPrivateKeyFilePathName: "src/GPKI/certs/SVR5640020001_sig.key" + sigPrivateKeyPasswd: "*sbm204221" gov: scheme: "http" host: "10.188.225.25:29001" # 예시: 운영 행정망 (명세에 맞춰 수정)