Merge pull request #34 from Central-MakeUs/dev

fix: 스프링부트3 cors config에 맞게 수정

admin/build.gradle

@@ -0,0 +1,40 @@
+// 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함
+// 스프링 부트 2.0 이상이라면 bootRepackage.enabled를 사용해야 함
+bootJar { enabled = true }
+
+// 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함
+jar { enabled = false }
+
+dependencies {
+    implementation project(':core:core-domain');
+    implementation project(':core:core-infra-rdb');
+    implementation project(':core:core-infra-qdsl');
+    implementation project(':core:core-infra-redis');
+    implementation project(':core:core-infra-s3');
+    implementation project(':core:core-security');
+
+    // validation
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+
+    // jpa
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
+    // queryDsl
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+    // security
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+
+    // redis
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'org.springframework.session:spring-session-data-redis'
+
+    // swagger
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+
+    // sentry
+    implementation 'io.sentry:sentry-spring-boot-starter-jakarta:7.1.0'
+}

admin/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

admin/src/main/java/com/example/admin/AdminApplication.java

@@ -0,0 +1,13 @@
+package com.example.admin;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AdminApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AdminApplication.class, args);
+	}
+
+}

admin/src/main/resources/application.properties

@@ -0,0 +1 @@
+

admin/src/test/java/com/example/admin/AdminApplicationTests.java

@@ -0,0 +1,13 @@
+package com.example.admin;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class AdminApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}

api/src/main/java/com/mm/api/config/WebMvcConfig.java

@@ -9,7 +9,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	@Override
 	public void addCorsMappings(CorsRegistry registry) {
 		registry.addMapping("/**")
-			.allowedOrigins("/**")
+			.allowedOriginPatterns("/**")
 			.allowedHeaders("*")
 			.allowedMethods("HEAD", "GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
 			.allowCredentials(true);

core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java

@@ -38,7 +38,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 		return http
 			.cors().configurationSource(request -> {
 				CorsConfiguration cors = new CorsConfiguration();
-				cors.setAllowedOrigins(List.of("*"));
+				cors.setAllowedOriginPatterns(List.of("*"));
 				cors.setAllowedMethods(List.of("HEAD", "GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
 				cors.setAllowedHeaders(List.of("*"));
 				cors.setAllowCredentials(true);

settings.gradle

@@ -1,6 +1,7 @@
 rootProject.name = 'daldal'
 
 include 'api'
+include 'admin'
 include 'core:core-domain'
 include 'core:core-infra-qdsl'
 include 'core:core-infra-rdb'