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 22eca24..6fb6765 100644 Binary files a/cim_for_netty/cim-boot-server/libs/cim-server-sdk-3.5.jar and b/cim_for_netty/cim-boot-server/libs/cim-android-sdk-3.5.1.jar differ 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(); }