From 876068872f05147255c5b27a0cee1ad715d270d4 Mon Sep 17 00:00:00 2001 From: jeonghyemin Date: Tue, 1 Jul 2025 16:23:19 +0900 Subject: [PATCH] =?UTF-8?q?refactor(APIAdmin,APIUser):=20cors=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application-admin/build.gradle | 1 + .../java/com/nowait/applicationadmin/ApiAdminApplication.java | 3 ++- .../src/main/java/com/nowait/config/config/CorsConfig.java | 2 +- application-user/build.gradle | 1 + .../java/com/nowait/applicationuser/ApiUserApplication.java | 4 ++-- .../applicationuser/order/dto/OrderCreateResponseDto.java | 2 ++ 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/application-admin/build.gradle b/application-admin/build.gradle index 31009a7f..43708f07 100644 --- a/application-admin/build.gradle +++ b/application-admin/build.gradle @@ -28,6 +28,7 @@ dependencies { implementation project(':domain-reservation') // 예약 관련 도메인 implementation project(':security-admin') // 인증 관련 도메인 implementation project(':infra-aws') // aws 관련 도메인 + implementation project(':application-config') // Spring Boot Starter implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/application-admin/src/main/java/com/nowait/applicationadmin/ApiAdminApplication.java b/application-admin/src/main/java/com/nowait/applicationadmin/ApiAdminApplication.java index 95f08d3a..4099bf40 100644 --- a/application-admin/src/main/java/com/nowait/applicationadmin/ApiAdminApplication.java +++ b/application-admin/src/main/java/com/nowait/applicationadmin/ApiAdminApplication.java @@ -9,7 +9,8 @@ @SpringBootApplication(scanBasePackages = { "com.nowait.applicationadmin", "com.nowait.infraaws", - "com.nowait.adminsecurity" + "com.nowait.adminsecurity", + "com.nowait.config" }) @EntityScan(basePackages = { "com.nowait.menu.entity", diff --git a/application-config/src/main/java/com/nowait/config/config/CorsConfig.java b/application-config/src/main/java/com/nowait/config/config/CorsConfig.java index 06823454..f86c679d 100644 --- a/application-config/src/main/java/com/nowait/config/config/CorsConfig.java +++ b/application-config/src/main/java/com/nowait/config/config/CorsConfig.java @@ -15,7 +15,7 @@ public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); // 쿠키나 인증헤더 자격증명 허용 - config.setAllowedOrigins(List.of("http://localhost:5173")); // 허용할 출처 설정 + config.setAllowedOrigins(List.of("http://localhost:5173","http://localhost:63342")); // 허용할 출처 설정 config.setAllowedMethods(List.of("GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS")); // 메서드 허용 config.setAllowedHeaders(List.of("*")); //클라이언트가 보낼 수 있는 헤더 config.setExposedHeaders(List.of("Authorization")); //클라이언트(브라우저)가 접근할 수 있는 헤더 지정 diff --git a/application-user/build.gradle b/application-user/build.gradle index 6b68d7be..cfa67b69 100644 --- a/application-user/build.gradle +++ b/application-user/build.gradle @@ -29,6 +29,7 @@ dependencies { implementation project(':infra-aws') // 사용자 관련 도메인 implementation project(':security-front') // 사용자 관련 도메인 implementation project(':external-oauth') // 외부 OAuth 관련 도메인 + implementation project(':application-config') // Spring Boot Starter implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/application-user/src/main/java/com/nowait/applicationuser/ApiUserApplication.java b/application-user/src/main/java/com/nowait/applicationuser/ApiUserApplication.java index 7e59d07d..fcfb659f 100644 --- a/application-user/src/main/java/com/nowait/applicationuser/ApiUserApplication.java +++ b/application-user/src/main/java/com/nowait/applicationuser/ApiUserApplication.java @@ -10,7 +10,8 @@ @SpringBootApplication(scanBasePackages = { "com.nowait.applicationuser", "com.nowait.frontsecurity", - "com.nowait.externaloauth" + "com.nowait.externaloauth", + "com.nowait.config" }) @EntityScan(basePackages = { "com.nowait.menu.entity", @@ -19,7 +20,6 @@ "com.nowait.user.entity", "com.nowait.bookmark.entity", "com.nowait.reservation.entity", - "com.nowait.order.entity", "com.nowait.order.entity" }) @EnableJpaRepositories(basePackages = { diff --git a/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateResponseDto.java b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateResponseDto.java index cd8f6568..3326d510 100644 --- a/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateResponseDto.java +++ b/application-user/src/main/java/com/nowait/applicationuser/order/dto/OrderCreateResponseDto.java @@ -15,6 +15,7 @@ public class OrderCreateResponseDto { private Long orderId; // 주문 ID // 주문 상태 (예: "주문완료", "배송중" 등) private Long storeId; // 상점 ID private String storeName; // 상점 이름 + private String sessionId; private List orderItems; // 주문 항목 목록 public static OrderCreateResponseDto fromEntity(UserOrder order) { @@ -22,6 +23,7 @@ public static OrderCreateResponseDto fromEntity(UserOrder order) { .orderId(order.getId()) .storeId(order.getStore().getStoreId()) .storeName(order.getStore().getName()) + .sessionId(order.getSessionId()) .orderItems(List.of()) .build(); }