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
broker/src/main/java/io/moquette/imhandler/IMHandler.java
+2 -1
View File
@@ -25,6 +25,7 @@ import io.netty.util.internal.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.GsonUtil;
import win.liyufan.im.RateLimiter;
import win.liyufan.im.Utility;
@@ -141,7 +142,7 @@ abstract public class IMHandler<T> {
// }
//json ?
return (T)(new Gson().fromJson(new String(bytes), dataCls));
return (T)(GsonUtil.gson.fromJson(new String(bytes), dataCls));
}
public static void init(IMessagesStore ms, ISessionsStore ss, MessagesPublisher p, ThreadPoolExecutorWrapper businessExecutor, Server server) {
broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
+2 -5
View File
@@ -20,10 +20,7 @@ import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import cn.wildfirechat.common.ErrorCode;
import io.netty.buffer.Unpooled;
import win.liyufan.im.HttpUtils;
import win.liyufan.im.IMTopic;
import win.liyufan.im.MessageShardingUtil;
import win.liyufan.im.Utility;
import win.liyufan.im.*;
import java.util.HashSet;
import java.util.Set;
@@ -219,7 +216,7 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
if(StringUtil.isNullOrEmpty(content)) {
saveAndPublish(fromUser, clientID, finalMsg, requestSourceType);
} else {
MessagePayload payload = new Gson().fromJson(content, MessagePayload.class);
MessagePayload payload = GsonUtil.gson.fromJson(content, MessagePayload.class);
if (payload != null && payload.getType() > 0) {
WFCMessage.Message newMsg = finalMsg.toBuilder().setContent(payload.toProtoMessageContent()).build();
saveAndPublish(fromUser, clientID, newMsg, requestSourceType);