Merge branch 'develop' into deploy

EFUB4-Jukebox · Aug 17, 2024 · 3b5bc9f · 3b5bc9f
2 parents 128685d + ef7ca6d
commit 3b5bc9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -46,6 +46,7 @@ dependencies {
 	implementation 'org.json:json:20231013' //JsonObject 사용 관련
 	implementation 'org.springframework.boot:spring-boot-starter-mail:3.2.2' //mail
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.1.2' //thymeleaf
+	implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1' //Jackson - ObjectMapper 시간 직렬화 관련
 }
 
 tasks.named('test') {

diff --git a/src/main/java/sws/songpin/global/config/AppConfig.java b/src/main/java/sws/songpin/global/config/AppConfig.java
@@ -2,9 +2,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.web.client.RestTemplate;
 
 @Configuration
@@ -19,6 +19,7 @@ public RestTemplate restTemplate() {
     public ObjectMapper objectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
         objectMapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
+        objectMapper.registerModule(new JavaTimeModule());
         return objectMapper;
     }
 }