chore(merge): merge refactor/module to master

.gitignore

@@ -37,4 +37,4 @@ out/
 
 ### VS Code ###
 .vscode/
-/main-service/src/main/generated/com/sickgyun/server
+/main-server/src/main/generated/com/sickgyun/server

build.gradle

@@ -23,19 +23,13 @@ subprojects {
     }
 
     dependencies {
-        implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
         implementation 'org.springframework.boot:spring-boot-starter-validation'
         implementation 'org.springframework.boot:spring-boot-starter-web'
 
-        //p6psy query extractor
-        implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'
-
         compileOnly 'org.projectlombok:lombok'
         annotationProcessor 'org.projectlombok:lombok'
         testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
-        testRuntimeOnly 'com.h2database:h2'
-
         repositories {
             mavenCentral()
         }
@@ -50,17 +44,6 @@ subprojects {
             extendsFrom annotationProcessor
         }
     }
-
-//openFeign
-    ext {
-        set('springCloudVersion', "2023.0.0")
-    }
-
-    dependencyManagement {
-        imports {
-            mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
-        }
-    }
 }
 
 fileTree(dir: 'setting', include: '*.gradle').each { file ->

logging/build.gradle → logging-server/build.gradle

@@ -3,9 +3,9 @@ dependencies {
 }
 
 bootJar {
-    enabled = false
+    enabled = true
 }
 
 jar {
-    enabled = true
+    enabled = false
 }

logging-server/src/main/java/com/sickgyun/server/domain/LoggingApplication.java

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

logging-server/src/main/java/com/sickgyun/server/domain/logging/CorsConfig.java

@@ -0,0 +1,33 @@
+package com.sickgyun.server.domain.logging;
+
+import static org.springframework.http.HttpHeaders.*;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@RequiredArgsConstructor
+public class CorsConfig implements WebMvcConfigurer {
+
+	private static final String ALLOW_ALL_PATH = "/**";
+	private static final String ALLOWED_METHODS = "*";
+	private static final String MAIN_SERVER_DOMAIN = "https://sickgyun.com";
+	private static final String FRONTEND_LOCALHOST = "http://localhost:3000";
+	private static final String HTTPS_FRONTEND_LOCALHOST = "https://localhost:3000";
+
+	@Override
+	public void addCorsMappings(CorsRegistry registry) {
+		registry.addMapping(ALLOW_ALL_PATH)
+			.allowedMethods(ALLOWED_METHODS)
+			.allowedOrigins(
+				MAIN_SERVER_DOMAIN,
+				FRONTEND_LOCALHOST,
+				HTTPS_FRONTEND_LOCALHOST
+			)
+			.allowCredentials(true)
+			.exposedHeaders(LOCATION, SET_COOKIE);
+	}
+}

logging/src/main/java/com/sickgyun/server/domain/Data.java → logging-server/src/main/java/com/sickgyun/server/domain/logging/Data.java

@@ -1,4 +1,4 @@
-package com.sickgyun.server.domain;
+package com.sickgyun.server.domain.logging;
 
 import java.util.Map;
 

logging/src/main/java/com/sickgyun/server/domain/DataController.java → logging-server/src/main/java/com/sickgyun/server/domain/logging/DataController.java

@@ -1,4 +1,4 @@
-package com.sickgyun.server.domain;
+package com.sickgyun.server.domain.logging;
 
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;

logging/src/main/java/com/sickgyun/server/domain/DataRepository.java → logging-server/src/main/java/com/sickgyun/server/domain/logging/DataRepository.java

@@ -1,4 +1,4 @@
-package com.sickgyun.server.domain;
+package com.sickgyun.server.domain.logging;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 

logging/src/main/java/com/sickgyun/server/domain/MongoConfig.java → logging-server/src/main/java/com/sickgyun/server/domain/logging/MongoConfig.java

@@ -1,4 +1,4 @@
-package com.sickgyun.server.domain;
+package com.sickgyun.server.domain.logging;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

logging-server/src/main/resources/application.yml

@@ -0,0 +1,10 @@
+server:
+  port: 8081
+  servlet:
+    contextPath: /api
+
+spring:
+  data:
+    mongodb:
+      uri: ${MONGO_URL}
+      database: ${MONGO_DB}

main-service/build.gradle → main-server/build.gradle

@@ -1,5 +1,9 @@
 dependencies {
-    implementation project(":logging")
+    //jpa
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
+    //p6psy query extractor
+    implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'
 
     //querydsl
     implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
@@ -27,6 +31,20 @@ dependencies {
     //aws s3
     implementation 'com.amazonaws:aws-java-sdk-s3:1.12.638'
     runtimeOnly 'com.mysql:mysql-connector-j'
+
+    //test h2
+    testRuntimeOnly 'com.h2database:h2'
+}
+
+//openFeign
+ext {
+    set('springCloudVersion', "2023.0.0")
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
 }
 
 //queryDsl

settings.gradle

@@ -1,3 +1,3 @@
 rootProject.name = 'server'
-include 'logging'
-include 'main-service'
+include 'logging-server'
+include 'main-server'