diff --git a/src/main/java/com/palnet/PavWebsocketApplication.java b/src/main/java/com/palnet/PavWebsocketApplication.java index 8248ffc..7be7718 100644 --- a/src/main/java/com/palnet/PavWebsocketApplication.java +++ b/src/main/java/com/palnet/PavWebsocketApplication.java @@ -14,9 +14,9 @@ public class PavWebsocketApplication { SpringApplication.run(PavWebsocketApplication.class, args); } - @Bean - public ObjectMapper objectMapper() { - return new ObjectMapper(); - } +// @Bean +// public ObjectMapper objectMapper() { +// return new ObjectMapper(); +// } } diff --git a/src/main/java/com/palnet/comn/utils/JsonUtils.java b/src/main/java/com/palnet/comn/utils/JsonUtils.java index 6b28ef2..dbcb8d7 100644 --- a/src/main/java/com/palnet/comn/utils/JsonUtils.java +++ b/src/main/java/com/palnet/comn/utils/JsonUtils.java @@ -11,7 +11,7 @@ import java.io.IOException; @Slf4j public class JsonUtils { - private static ObjectMapper getObjectMapper() { + public static ObjectMapper getObjectMapper() { ObjectMapper mapper = new ObjectMapper(); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); return mapper; diff --git a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java index be77f23..cbe14bb 100644 --- a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java @@ -5,15 +5,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.palnet.comn.model.CtrCntrlModel; import com.palnet.comn.model.GPHistoryShareContext; import com.palnet.comn.model.GPDatabaseModel; +import com.palnet.comn.utils.JsonUtils; import com.palnet.server.collection.ChannelCollection; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; - @Component @Slf4j public class MessageConsumer { @@ -23,8 +21,8 @@ public class MessageConsumer { private final ObjectMapper objectMapper; private final GPHistoryShareContext gpHistoryShareModel; - public MessageConsumer(ObjectMapper objectMapper, GPHistoryShareContext gpHistoryShareModel) { - this.objectMapper = objectMapper; + public MessageConsumer(GPHistoryShareContext gpHistoryShareModel) { + this.objectMapper = JsonUtils.getObjectMapper(); this.gpHistoryShareModel = gpHistoryShareModel; }