From 8f9d420ba213b4cd5076b53fb734ca5b23314717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BF=9C=E6=96=B9=E5=A4=95=E9=98=B3?= Date: Thu, 14 Apr 2022 17:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AFsdk=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=BC=98=E5=8C=96?= 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 91788 -> 92587 bytes .../cim/coder/protobuf/AppMessageDecoder.java | 26 ++++++++++------ .../exception/ReadInvalidTypeException.java | 29 ++++++++++++++++++ .../farsunset/cim/handler/LoggingHandler.java | 5 ++- 4 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 cim-server-sdk/src/main/java/com/farsunset/cim/exception/ReadInvalidTypeException.java 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 e2b43491eaabe6bfc2518acf661eda8298531b7a..fbee3969fd19301917008b9237a773329fd29730 100644 GIT binary patch delta 7114 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 F@IP49!P)=- diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageDecoder.java b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageDecoder.java index db3342a..9d14087 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageDecoder.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/coder/protobuf/AppMessageDecoder.java @@ -23,6 +23,7 @@ package com.farsunset.cim.coder.protobuf; import com.farsunset.cim.constant.CIMConstant; import com.farsunset.cim.constant.ChannelAttr; +import com.farsunset.cim.exception.ReadInvalidTypeException; import com.farsunset.cim.model.Pong; import com.farsunset.cim.model.SentBody; import com.farsunset.cim.model.proto.SentBodyProto; @@ -65,28 +66,33 @@ public class AppMessageDecoder extends ByteToMessageDecoder { return; } - byte[] dataBytes = new byte[length]; - buffer.readBytes(dataBytes); + byte[] content = new byte[length]; + buffer.readBytes(content); - Object message = mappingMessageObject(dataBytes, type); + Object message = mappingMessageObject(content, type); queue.add(message); } - public Object mappingMessageObject(byte[] data, byte type) throws com.google.protobuf.InvalidProtocolBufferException { + private Object mappingMessageObject(byte[] data, byte type) throws com.google.protobuf.InvalidProtocolBufferException { if (CIMConstant.DATA_TYPE_PONG == type) { return Pong.getInstance(); } - SentBodyProto.Model bodyProto = SentBodyProto.Model.parseFrom(data); - SentBody body = new SentBody(); - body.setData(bodyProto.getDataMap()); - body.setKey(bodyProto.getKey()); - body.setTimestamp(bodyProto.getTimestamp()); + if (CIMConstant.DATA_TYPE_SENT == type) { - return body; + SentBodyProto.Model bodyProto = SentBodyProto.Model.parseFrom(data); + SentBody body = new SentBody(); + body.setData(bodyProto.getDataMap()); + body.setKey(bodyProto.getKey()); + body.setTimestamp(bodyProto.getTimestamp()); + + return body; + } + + throw new ReadInvalidTypeException(type); } /** diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/exception/ReadInvalidTypeException.java b/cim-server-sdk/src/main/java/com/farsunset/cim/exception/ReadInvalidTypeException.java new file mode 100644 index 0000000..4e66f2f --- /dev/null +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/exception/ReadInvalidTypeException.java @@ -0,0 +1,29 @@ +/* + * Copyright 2013-2019 Xia Jun(3979434@qq.com). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + *************************************************************************************** + * * + * Website : http://www.farsunset.com * + * * + *************************************************************************************** + */ +package com.farsunset.cim.exception; + +public class ReadInvalidTypeException extends RuntimeException{ + + public ReadInvalidTypeException(byte type) { + super("Read invalid tag : " + type); + } +} diff --git a/cim-server-sdk/src/main/java/com/farsunset/cim/handler/LoggingHandler.java b/cim-server-sdk/src/main/java/com/farsunset/cim/handler/LoggingHandler.java index 0488cf1..ac3b9ce 100644 --- a/cim-server-sdk/src/main/java/com/farsunset/cim/handler/LoggingHandler.java +++ b/cim-server-sdk/src/main/java/com/farsunset/cim/handler/LoggingHandler.java @@ -102,7 +102,10 @@ public class LoggingHandler extends io.netty.handler.logging.LoggingHandler { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - logger.warn("EXCEPTION",cause); + String name = Thread.currentThread().getName(); + setThreadName(ctx); + logger.warn(this.format(ctx, "EXCEPTION", cause), cause); + Thread.currentThread().setName(name); } private void setThreadName(ChannelHandlerContext context){