bugfix jackson deserialize localDatetime error (#1249)

apache · Sep 13, 2023 · 525539b · 525539b
1 parent f067e76
commit 525539b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertServiceImpl.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/service/impl/AlertServiceImpl.java
@@ -17,7 +17,6 @@
 
 package org.dromara.hertzbeat.alert.service.impl;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.dromara.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.dromara.hertzbeat.alert.dao.AlertDao;
 import org.dromara.hertzbeat.alert.dto.AlertPriorityNum;
@@ -156,15 +155,17 @@ private Alert buildAlertData(AlertReport alertReport){
         }else{
             sb = new StringBuilder(alertReport.getContent());
         }
-
+        LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(alertReport.getAlertTime()), 
+                ZoneId.systemDefault());
         return Alert.builder()
                 .content("Alert Center\n" + sb)
                 .priority(alertReport.getPriority().byteValue())
                 .status(CommonConstants.ALERT_STATUS_CODE_PENDING)
                 .tags(alertReport.getLabels())
                 .target(alertReport.getAlertName())
                 .triggerTimes(1)
-                .gmtCreate(LocalDateTime.ofInstant(Instant.ofEpochMilli(alertReport.getAlertTime()), ZoneId.systemDefault()))
+                .gmtCreate(dateTime)
+                .gmtUpdate(dateTime)
                 .build();
     }
 

diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/AlertReport.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/dto/AlertReport.java
@@ -50,7 +50,7 @@ public class AlertReport {
     private Integer alertDuration;
 
     @Schema(title = "Time when the log service receives the alarm message", description = "日志服务接收到告警消息的时间",
-            example = "1648889320", accessMode = READ_WRITE)
+            example = "1694589491000", accessMode = READ_WRITE)
     private long alertTime;
 
     @Schema(title = "Alarm priority. 0: high emergency alarm red 1: medium critical serious alarm Orange 2: low warning warning alarm yellow",

diff --git a/common/src/main/java/org/dromara/hertzbeat/common/util/JsonUtil.java b/common/src/main/java/org/dromara/hertzbeat/common/util/JsonUtil.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 
@@ -41,7 +42,8 @@ public class JsonUtil {
     static {
         OBJECT_MAPPER
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-                .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+                .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
+                .registerModule(new JavaTimeModule());
     }
 
     public static String toJson(Object source) {