diff --git a/payment-service/src/main/java/gcu/web/paymentservice/common/config/WebMvcConfig.java b/payment-service/src/main/java/gcu/web/paymentservice/common/config/WebMvcConfig.java index e998ddf..c592bc3 100644 --- a/payment-service/src/main/java/gcu/web/paymentservice/common/config/WebMvcConfig.java +++ b/payment-service/src/main/java/gcu/web/paymentservice/common/config/WebMvcConfig.java @@ -2,8 +2,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration @@ -12,7 +10,7 @@ public class WebMvcConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") - .allowedOrigins("http://localhost:3000", "http://54.66.149.225", " http://34.127.7.212") + .allowedOrigins("http://localhost:3000", "http://localhost:5173", "http://54.66.149.225", "http://34.127.7.212") .allowedMethods("GET", "POST", "PUT", "DELETE") .allowedHeaders("*") // 모든 헤더 허용 .allowCredentials(true); // 쿠키 포함 허용; diff --git a/payment-service/src/main/java/gcu/web/paymentservice/platform/adapter/out/external/order/OrderFeignPort.java b/payment-service/src/main/java/gcu/web/paymentservice/platform/adapter/out/external/order/OrderFeignPort.java index 6b9987d..2872cdd 100644 --- a/payment-service/src/main/java/gcu/web/paymentservice/platform/adapter/out/external/order/OrderFeignPort.java +++ b/payment-service/src/main/java/gcu/web/paymentservice/platform/adapter/out/external/order/OrderFeignPort.java @@ -3,9 +3,10 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; -@FeignClient(name = "order-service", url = "http://34.127.7.212:8101") +@FeignClient(name = "order-service", url = "http://54.66.149.225:8100") public interface OrderFeignPort { /* @@ -15,8 +16,9 @@ public interface OrderFeignPort { @PostMapping("/api/v1/orders/{orderId}/cancel") String cancelOrder(@PathVariable("orderId") String orderId); - @PostMapping("/api/v1/orders/{orderId}") - String completeOrder(@PathVariable("orderId") String orderId); + @PutMapping("/api/v1/orders/{orderId}/submit") + String completeOrder(@PathVariable("orderId") Long orderId); + } diff --git a/payment-service/src/main/java/gcu/web/paymentservice/platform/application/service/PaymentService.java b/payment-service/src/main/java/gcu/web/paymentservice/platform/application/service/PaymentService.java index d9e7816..29060c2 100644 --- a/payment-service/src/main/java/gcu/web/paymentservice/platform/application/service/PaymentService.java +++ b/payment-service/src/main/java/gcu/web/paymentservice/platform/application/service/PaymentService.java @@ -63,7 +63,7 @@ public Payment savePayment(ConfirmPaymentRequest confirmPaymentRequest) throws E Payment saved = paymentPort.savePayment(payment); // 주문 정보 전달 - orderFeignPort.completeOrder(saved.getOrderId()); + orderFeignPort.completeOrder(Long.valueOf(saved.getOrderId())); return saved;