anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gson单例化，另外关掉gson html转义功能

Browse Source
This commit is contained in:
heavyrian2012
2022-08-31 20:24:46 +08:00
parent 97540bdd1b
commit 04c89d1fc1
32 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/cn/wildfirechat/pojos/ArticleContent.java
+2 -1
View File
@@ -1,6 +1,7 @@
package cn.wildfirechat.pojos;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -47,7 +48,7 @@ public class ArticleContent {
MessagePayload payload = new MessagePayload();
payload.setType(13);
payload.setSearchableContent(top.title);
payload.setBase64edData(Base64.getEncoder().encodeToString(new Gson().toJson(this).getBytes(StandardCharsets.UTF_8)));
payload.setBase64edData(Base64.getEncoder().encodeToString(new GsonBuilder().disableHtmlEscaping().create().toJson(this).getBytes(StandardCharsets.UTF_8)));
return payload;
}
}
common/src/main/java/cn/wildfirechat/pojos/GroupNotificationBinaryContent.java
+2 -1
View File
@@ -11,6 +11,7 @@ package cn.wildfirechat.pojos;
import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.protobuf.ByteString;
import java.util.List;
@@ -89,7 +90,7 @@ public class GroupNotificationBinaryContent {
}
public WFCMessage.MessageContent getGroupNotifyContent(int groupContentType) {
return WFCMessage.MessageContent.newBuilder().setType(groupContentType).setData(ByteString.copyFromUtf8(new Gson().toJson(this))).build();
return WFCMessage.MessageContent.newBuilder().setType(groupContentType).setData(ByteString.copyFromUtf8(new GsonBuilder().disableHtmlEscaping().create().toJson(this))).build();
}
public WFCMessage.MessageContent getAddGroupNotifyContent() {