From 8cd43fdf9c230e9ee314501af3f39d8b36b544cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=9C=E6=96=B9=E5=A4=95=E9=98=B3?= Date: Wed, 11 May 2022 11:10:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9json=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96ReplyBody=20=E4=B8=A2=E5=A4=B1data=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libs/cim-server-sdk-netty-4.2.0.jar | Bin 94260 -> 94449 bytes .../java/com/farsunset/cim/model/Message.java | 16 ++++++++-------- .../com/farsunset/cim/model/ReplyBody.java | 12 ++++++------ .../com/farsunset/cim/model/SentBody.java | 10 ++++------ 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/cim-boot-server/libs/cim-server-sdk-netty-4.2.0.jar b/cim-boot-server/libs/cim-server-sdk-netty-4.2.0.jar index 076378fce2743178bf85bebc01d1c5460b8e60c5..6a4c2107a238b5f42d86750962447c75ffcf1223 100644 GIT binary patch delta 7764 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 delta 7475 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

hW)H>}#F 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 builder.append("\n").append(k).append(":").append(v)); - builder.append("\n}"); + builder.append(data.isEmpty() ? "" : "\n").append("}"); return builder.toString(); } diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/model/SentBody.java b/cim-server-sdk/src/main/java/com/farsunset/cim/model/SentBody.java index 5cd509d..9bf5b51 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/model/SentBody.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/model/SentBody.java @@ -77,13 +77,11 @@ public class SentBody implements Serializable { public String toString() { StringBuilder builder = new StringBuilder(); builder.append("[SentBody]").append("\n"); - builder.append("key:").append(key).append("\n"); - builder.append("timestamp:").append(timestamp).append("\n"); - - builder.append("data:{"); + builder.append("key :").append(this.getKey()).append("\n"); + builder.append("timestamp :").append(timestamp).append("\n"); + builder.append("data :").append("\n{"); data.forEach((k, v) -> builder.append("\n").append(k).append(":").append(v)); - builder.append("\n}"); - + builder.append(data.isEmpty() ? "" : "\n").append("}"); return builder.toString(); }