From daa76c63550dbdcab96c4a97a4bdb972058e4803 Mon Sep 17 00:00:00 2001 From: luxurong Date: Sat, 25 Dec 2021 09:05:46 +0800 Subject: [PATCH 1/3] version --- .../main/java/io/github/quickmsg/common/utils/JacksonUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smqtt-common/src/main/java/io/github/quickmsg/common/utils/JacksonUtil.java b/smqtt-common/src/main/java/io/github/quickmsg/common/utils/JacksonUtil.java index 3ba292d3..158a58ef 100644 --- a/smqtt-common/src/main/java/io/github/quickmsg/common/utils/JacksonUtil.java +++ b/smqtt-common/src/main/java/io/github/quickmsg/common/utils/JacksonUtil.java @@ -34,7 +34,7 @@ public class JacksonUtil { try { return mapper.writeValueAsString(data); } catch (JsonProcessingException e) { - log.error("JacksonUtil bean2Json error", e); + log.error("JacksonUtil bean2Json {} error",data, e); return ""; } } -- Gitee From 108129cf18f54698d87e56ef5cfc351b7615cf87 Mon Sep 17 00:00:00 2001 From: luxurong Date: Sat, 25 Dec 2021 09:22:57 +0800 Subject: [PATCH 2/3] version --- .../java/io/github/quickmsg/common/metric/MetricManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smqtt-common/src/main/java/io/github/quickmsg/common/metric/MetricManager.java b/smqtt-common/src/main/java/io/github/quickmsg/common/metric/MetricManager.java index 561d369b..ea05e594 100644 --- a/smqtt-common/src/main/java/io/github/quickmsg/common/metric/MetricManager.java +++ b/smqtt-common/src/main/java/io/github/quickmsg/common/metric/MetricManager.java @@ -38,7 +38,7 @@ public interface MetricManager { MemoryMXBean mxb = ManagementFactory.getMemoryMXBean(); ThreadMXBean threadBean = ManagementFactory.getThreadMXBean(); RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); - metrics.put("smqtt", "1.1.0"); + metrics.put("smqtt", "1.1.1"); metrics.put("start_time", sdf.format(new Date(runtimeBean.getStartTime()))); metrics.put("jdk_home", props.getProperty("java.home")); metrics.put("jdk_version", props.getProperty("java.version")); -- Gitee From a29e51672143cc2093cefdca0c11c95ae867c2e9 Mon Sep 17 00:00:00 2001 From: luxurong Date: Sat, 25 Dec 2021 09:25:06 +0800 Subject: [PATCH 3/3] version --- .../main/java/io/github/quickmsg/common/channel/MqttChannel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MqttChannel.java b/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MqttChannel.java index aa8f7410..3ac5af9b 100644 --- a/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MqttChannel.java +++ b/smqtt-common/src/main/java/io/github/quickmsg/common/channel/MqttChannel.java @@ -77,6 +77,7 @@ public class MqttChannel { private Disposable closeDisposable; + @JsonIgnore private TimeAckManager timeAckManager; public void disposableClose() { -- Gitee