tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-06-06 18:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55 from myzjy/main

Browse Source 
json websocket attachmentId whether  isEmpty
This commit is contained in:
godotg
2023-04-09 21:50:42 +08:00
committed by GitHub
parent 6abf4d4350 c90367d221
commit fe97e9f0fb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/src/main/java/com/zfoo/net/handler/codec/json/JsonWebSocketCodecHandler.java
+8 -4
View File
@@ -42,12 +42,16 @@ public class JsonWebSocketCodecHandler extends MessageToMessageCodec<WebSocketFr
var jsonMap = JsonUtils.getJsonMap(jsonStr);
var protocolId = Short.parseShort(jsonMap.get("protocolId"));
var packetStr = jsonMap.get("packet");
var attachmentId = Short.parseShort(jsonMap.get("attachmentId"));
var attachmentStr = jsonMap.get("attachmentId");
IAttachment attachment = null;
if (attachmentId >= 0) {
var attachmentClass = ProtocolManager.getProtocol(attachmentId).protocolConstructor().getDeclaringClass();
attachment = (IAttachment) JsonUtils.string2Object(jsonMap.get("attachment"), attachmentClass);
if (!StringUtils.isEmpty(attachmentStr)) {
var attachmentId = Short.parseShort(attachmentStr);
if (attachmentId >= 0) {
var attachmentClass = ProtocolManager.getProtocol(attachmentId).protocolConstructor().getDeclaringClass();
attachment = (IAttachment) JsonUtils.string2Object(jsonMap.get("attachment"), attachmentClass);
}
}
var protocolClass = ProtocolManager.getProtocol(protocolId).protocolConstructor().getDeclaringClass();
var packet = JsonUtils.string2Object(packetStr, protocolClass);
list.add(DecodedPacketInfo.valueOf((IPacket) packet, attachment));