diff --git a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java index 0d7d695..5d3ddce 100644 --- a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java +++ b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java @@ -1,8 +1,10 @@ package org.dromara.common.websocket.utils; import cn.hutool.core.collection.CollUtil; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -91,9 +93,12 @@ public class WebSocketUtils { .setData(Objects.requireNonNullElse(data, "")) .setTimestamp(System.currentTimeMillis()) .setBizCode(bizCode); - ObjectMapper mapper = new ObjectMapper(); + try { WebSocketMessageDto broadcastMessage = new WebSocketMessageDto(); + ObjectMapper mapper = new ObjectMapper(); + mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); broadcastMessage.setMessage(mapper.writeValueAsString(message)); RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message); @@ -112,9 +117,11 @@ public class WebSocketUtils { .setData(Objects.requireNonNullElse(data, "")) .setTimestamp(System.currentTimeMillis()) .setBizCode(bizCode); - ObjectMapper mapper = new ObjectMapper(); try { WebSocketMessageDto broadcastMessage = new WebSocketMessageDto(); + ObjectMapper mapper = new ObjectMapper(); + mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); broadcastMessage.setMessage(mapper.writeValueAsString(message)); RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message); diff --git a/pom.xml b/pom.xml index 63a9d40..2577794 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ - dev + wuyuan dev