From 0067844a7cdcbd705975ced36e4fb19c35f052dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=9C=E6=96=B9=E5=A4=95=E9=98=B3?= <3979434@qq.com>
Date: Fri, 28 Dec 2018 10:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9netty=E7=89=88=E6=9C=ACwebsoc?=
=?UTF-8?q?ket=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=87=B4?=
=?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=87=BA=E7=8E=B0java.lang.IndexOutOfBoundsE?=
=?UTF-8?q?xception=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cim_for_netty/cim-boot-server/.project | 5 +++++
.../org.springframework.ide.eclipse.prefs | 2 ++
cim_for_netty/cim-boot-server/build.gradle | 12 ++++++------
...-sdk-3.5.jar => cim-android-sdk-3.5.1.jar} | Bin 80013 -> 80008 bytes
.../filter/decoder/WebMessageDecoder.java | 6 ++++--
5 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 cim_for_netty/cim-boot-server/.settings/org.springframework.ide.eclipse.prefs
rename cim_for_netty/cim-boot-server/libs/{cim-server-sdk-3.5.jar => cim-android-sdk-3.5.1.jar} (81%)
diff --git a/cim_for_netty/cim-boot-server/.project b/cim_for_netty/cim-boot-server/.project
index 2766f46..67a0e0b 100644
--- a/cim_for_netty/cim-boot-server/.project
+++ b/cim_for_netty/cim-boot-server/.project
@@ -15,6 +15,11 @@
+
+ org.springframework.ide.eclipse.boot.validation.springbootbuilder
+
+
+
org.eclipse.jdt.core.javanature
diff --git a/cim_for_netty/cim-boot-server/.settings/org.springframework.ide.eclipse.prefs b/cim_for_netty/cim-boot-server/.settings/org.springframework.ide.eclipse.prefs
new file mode 100644
index 0000000..a12794d
--- /dev/null
+++ b/cim_for_netty/cim-boot-server/.settings/org.springframework.ide.eclipse.prefs
@@ -0,0 +1,2 @@
+boot.validation.initialized=true
+eclipse.preferences.version=1
diff --git a/cim_for_netty/cim-boot-server/build.gradle b/cim_for_netty/cim-boot-server/build.gradle
index 02fb348..b4a7037 100644
--- a/cim_for_netty/cim-boot-server/build.gradle
+++ b/cim_for_netty/cim-boot-server/build.gradle
@@ -50,12 +50,12 @@ dependencies {
compile 'com.squareup.okhttp3:okhttp:3.10.0'
compile 'cn.teaey.apns4j:apns4j:1.1.4'
- compile 'io.netty:netty-handler:4.1.28.Final'
- compile 'io.netty:netty-buffer:4.1.28.Final'
- compile 'io.netty:netty-codec:4.1.28.Final'
- compile 'io.netty:netty-codec-http:4.1.28.Final'
- compile 'io.netty:netty-common:4.1.28.Final'
- compile 'io.netty:netty-transport:4.1.28.Final'
+ compile 'io.netty:netty-handler:4.1.32.Final'
+ compile 'io.netty:netty-buffer:4.1.32.Final'
+ compile 'io.netty:netty-codec:4.1.32.Final'
+ compile 'io.netty:netty-codec-http:4.1.32.Final'
+ compile 'io.netty:netty-common:4.1.32.Final'
+ compile 'io.netty:netty-transport:4.1.32.Final'
diff --git a/cim_for_netty/cim-boot-server/libs/cim-server-sdk-3.5.jar b/cim_for_netty/cim-boot-server/libs/cim-android-sdk-3.5.1.jar
similarity index 81%
rename from cim_for_netty/cim-boot-server/libs/cim-server-sdk-3.5.jar
rename to cim_for_netty/cim-boot-server/libs/cim-android-sdk-3.5.1.jar
index 22eca247adb76f3f2d1e05d8e17c8538b8220ece..6fb67651264c9eafbee9a8e3c74281766c98a9bb 100644
GIT binary patch
delta 8216
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
Q5gjNEKncb3?;ACfa9{r~^~
delta 8288
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
PCz~7%ZH5gQaA^MnyL3;4
diff --git a/cim_for_netty/cim-server-sdk/src/com/farsunset/cim/sdk/server/filter/decoder/WebMessageDecoder.java b/cim_for_netty/cim-server-sdk/src/com/farsunset/cim/sdk/server/filter/decoder/WebMessageDecoder.java
index 69a500b..997b3a2 100644
--- a/cim_for_netty/cim-server-sdk/src/com/farsunset/cim/sdk/server/filter/decoder/WebMessageDecoder.java
+++ b/cim_for_netty/cim-server-sdk/src/com/farsunset/cim/sdk/server/filter/decoder/WebMessageDecoder.java
@@ -21,6 +21,7 @@
*/
package com.farsunset.cim.sdk.server.filter.decoder;
+import java.nio.charset.Charset;
import java.util.List;
import com.farsunset.cim.sdk.server.constant.CIMConstant;
@@ -103,7 +104,7 @@ public class WebMessageDecoder extends ByteToMessageDecoder {
}
} else if (OPCODE_CLOSE == frameOqcode) {
- handleClose(arg0);
+ handleSocketClosed(arg0,iobuffer);
} else {
// 忽略其他类型的消息
iobuffer.readBytes(new byte[iobuffer.readableBytes()]);
@@ -111,7 +112,8 @@ public class WebMessageDecoder extends ByteToMessageDecoder {
}
- private void handleClose(ChannelHandlerContext arg0) {
+ private void handleSocketClosed(ChannelHandlerContext arg0,ByteBuf iobuffer) {
+ iobuffer.readBytes(new byte[iobuffer.readableBytes()]);
arg0.channel().close();
}