diff --git a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/token/ClientTokenManager.java b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/token/ClientTokenManager.java
index 28ff8bc..9d33e86 100644
--- a/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/token/ClientTokenManager.java
+++ b/cloud-common-plugin-oauth/src/main/java/com/cm/common/plugin/oauth/token/ClientTokenManager.java
@@ -50,7 +50,7 @@ public class ClientTokenManager {
params.put("client_id", oauthClientProperties.getClientId());
params.put("client_secret", oauthClientProperties.getClientSecret());
params.put("scope", "all");
- String result = restTemplateUtil.doPostFormNormal(String.format("%s/oauth/token", oauthProperties.getOauthServer()), params);
+ String result = restTemplateUtil.doPostFormNormal(String.format("%s/oauth_client/token", oauthProperties.getOauthServer()), params);
if (StringUtils.isBlank(result)) {
LOG.error("客户端获取token失效");
} else {
diff --git a/cloud-common-socket-client/pom.xml b/cloud-common-socket-client/pom.xml
new file mode 100644
index 0000000..3c8fbf2
--- /dev/null
+++ b/cloud-common-socket-client/pom.xml
@@ -0,0 +1,23 @@
+
+
+
+ cm-cloud
+ com.cm
+ 1.0.1-SNAPSHOT
+
+ 4.0.0
+
+ cloud-common-socket-client
+
+
+
+ com.cm
+ cloud-common-socket
+ 1.0.1-SNAPSHOT
+
+
+
+
+
\ No newline at end of file
diff --git a/cloud-common-socket-client/src/main/java/com/cm/socket/client/MessageSocketClient.java b/cloud-common-socket-client/src/main/java/com/cm/socket/client/MessageSocketClient.java
new file mode 100644
index 0000000..f67dd5d
--- /dev/null
+++ b/cloud-common-socket-client/src/main/java/com/cm/socket/client/MessageSocketClient.java
@@ -0,0 +1,111 @@
+package com.cm.socket.client;
+
+import com.cm.socket.client.config.MessageSocketClientConfig;
+import com.cm.socket.client.handler.MessageClientChannelInitializer;
+import com.cm.socket.client.service.AbstractMessageClientService;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioSocketChannel;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: MessageSocketClient
+ * @Description: 消息客户端
+ * @Author: WangGeng
+ * @Date: 2020/7/5 10:03 下午
+ * @Version: 1.0
+ **/
+public class MessageSocketClient implements Runnable {
+
+ private static final MessageSocketClient messageSocketClient = MessageSocketClientBuilder.messageSocketClient;
+ private AbstractMessageClientService abstractMessageClientService;
+ private MessageSocketClientConfig messageSocketClientConfig;
+ private int currentReconnectCount = 1;
+ private int currentReconnectTime = 1;
+ EventLoopGroup eventLoopGroup;
+ Bootstrap bootstrap;
+
+ private MessageSocketClient() {
+ this.eventLoopGroup = new NioEventLoopGroup();
+ this.bootstrap = new Bootstrap();
+ this.bootstrap.group(eventLoopGroup);
+ }
+
+ public static MessageSocketClient getInstance() {
+ return messageSocketClient;
+ }
+
+ public void initClient(AbstractMessageClientService abstractMessageClientService, MessageSocketClientConfig messageSocketClientConfig) {
+ this.messageSocketClientConfig = messageSocketClientConfig;
+ this.abstractMessageClientService = abstractMessageClientService;
+ this.bootstrap.channel(NioSocketChannel.class);
+ this.bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
+ this.bootstrap.handler(new MessageClientChannelInitializer(this.abstractMessageClientService, this.messageSocketClientConfig));
+ }
+
+ @Override
+ public void run() {
+ ChannelFuture channelFuture = this.bootstrap.connect(messageSocketClientConfig.getHost(), messageSocketClientConfig.getPort());
+ channelFuture.addListener((ChannelFutureListener) future -> {
+ if (!future.isSuccess()) {
+ future.channel().pipeline().fireChannelInactive();
+ }
+ });
+ channelFuture.channel().closeFuture();
+ }
+
+ private static class MessageSocketClientBuilder {
+ public static final MessageSocketClient messageSocketClient = new MessageSocketClient();
+ }
+
+ public static void main(String[] args) {
+ MessageSocketClientConfig messageSocketClientConfig = new MessageSocketClientConfig();
+ messageSocketClientConfig.setHost("127.0.0.1");
+ messageSocketClientConfig.setPort(9999);
+ messageSocketClientConfig.setDelayPingSeconds(3);
+ messageSocketClientConfig.setMaxReconnectCount(10);
+ messageSocketClientConfig.setReconnectTimeStep(1);
+
+ AbstractMessageClientService abstractMessageClientService = new AbstractMessageClientService() {
+ @Override
+ public void readMessage(String message) {
+ System.out.println(message);
+ }
+ };
+
+ MessageSocketClient messageSocketClient = MessageSocketClient.getInstance();
+ messageSocketClient.initClient(abstractMessageClientService, messageSocketClientConfig);
+ messageSocketClient.run();
+
+ new Thread(() -> {
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ abstractMessageClientService.sendMessage("我是客户端");
+ }).run();
+ }
+
+ public int getCurrentReconnectCount() {
+ return currentReconnectCount <= 1 ? 1 : currentReconnectCount;
+ }
+
+ public void setCurrentReconnectCount(int currentReconnectCount) {
+ this.currentReconnectCount = currentReconnectCount;
+ }
+
+ public int getCurrentReconnectTime() {
+ return currentReconnectTime <= 1 ? 1 : currentReconnectTime;
+ }
+
+ public void setCurrentReconnectTime(int currentReconnectTime) {
+ this.currentReconnectTime = currentReconnectTime;
+ }
+}
diff --git a/cloud-common-socket-client/src/main/java/com/cm/socket/client/config/MessageSocketClientConfig.java b/cloud-common-socket-client/src/main/java/com/cm/socket/client/config/MessageSocketClientConfig.java
new file mode 100644
index 0000000..dab26c6
--- /dev/null
+++ b/cloud-common-socket-client/src/main/java/com/cm/socket/client/config/MessageSocketClientConfig.java
@@ -0,0 +1,80 @@
+package com.cm.socket.client.config;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: MessageSocketClientConfig
+ * @Description: 消息客户端配置
+ * @Author: WangGeng
+ * @Date: 2020/7/7 11:04 下午
+ * @Version: 1.0
+ **/
+@Component
+public class MessageSocketClientConfig {
+
+ private String host;
+ private int port;
+ private int maxReconnectCount;
+ private int reconnectTimeStep;
+ private int delayPingSeconds;
+
+ public String getHost() {
+ return host == null ? "" : host.trim();
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public int getMaxReconnectCount() {
+ return maxReconnectCount <= 0 ? 20 : maxReconnectCount;
+ }
+
+ public void setMaxReconnectCount(int maxReconnectCount) {
+ this.maxReconnectCount = maxReconnectCount;
+ }
+
+ public int getReconnectTimeStep() {
+ return reconnectTimeStep <= 0 ? 0 : reconnectTimeStep;
+ }
+
+ public void setReconnectTimeStep(int reconnectTimeStep) {
+ this.reconnectTimeStep = reconnectTimeStep;
+ }
+
+ public int getDelayPingSeconds() {
+ return delayPingSeconds <= 0 ? 3 : delayPingSeconds;
+ }
+
+ public void setDelayPingSeconds(int delayPingSeconds) {
+ this.delayPingSeconds = delayPingSeconds;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder("{");
+ sb.append("\"host\":")
+ .append("\"").append(host).append("\"");
+ sb.append(",\"port\":")
+ .append(port);
+ sb.append(",\"maxReconnectCount\":")
+ .append(maxReconnectCount);
+ sb.append(",\"reconnectTimeStep\":")
+ .append(reconnectTimeStep);
+ sb.append(",\"delayPingSeconds\":")
+ .append(delayPingSeconds);
+ sb.append('}');
+ return sb.toString();
+ }
+}
diff --git a/cloud-common-socket-client/src/main/java/com/cm/socket/client/handler/MessageClientChannelInitializer.java b/cloud-common-socket-client/src/main/java/com/cm/socket/client/handler/MessageClientChannelInitializer.java
new file mode 100644
index 0000000..542a8f0
--- /dev/null
+++ b/cloud-common-socket-client/src/main/java/com/cm/socket/client/handler/MessageClientChannelInitializer.java
@@ -0,0 +1,39 @@
+package com.cm.socket.client.handler;
+
+import com.cm.socket.client.MessageSocketClient;
+import com.cm.socket.client.config.MessageSocketClientConfig;
+import com.cm.socket.client.service.AbstractMessageClientService;
+import com.cm.socket.decoder.MessageDecoder;
+import com.cm.socket.encoder.MessageEncoder;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.socket.SocketChannel;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: MessageClientChannelInitializer
+ * @Description: 消息客户端初始化
+ * @Author: WangGeng
+ * @Date: 2020/7/6 9:32 上午
+ * @Version: 1.0
+ **/
+public class MessageClientChannelInitializer extends ChannelInitializer {
+
+ private AbstractMessageClientService abstractMessageClientService;
+ private MessageSocketClientConfig messageSocketClientConfig;
+
+ public MessageClientChannelInitializer(AbstractMessageClientService abstractMessageClientService, MessageSocketClientConfig messageSocketClientConfig) {
+ this.abstractMessageClientService = abstractMessageClientService;
+ this.messageSocketClientConfig = messageSocketClientConfig;
+ }
+
+ @Override
+ protected void initChannel(SocketChannel ch) throws Exception {
+ ch.pipeline().addLast(new MessageEncoder());
+ ch.pipeline().addLast(new MessageDecoder());
+ ch.pipeline().addLast(new MessageClientPingHandler(MessageSocketClient.getInstance(), messageSocketClientConfig));
+ ch.pipeline().addLast(new MessageClientHandler(abstractMessageClientService));
+ }
+
+}
diff --git a/cloud-common-socket-client/src/main/java/com/cm/socket/client/handler/MessageClientHandler.java b/cloud-common-socket-client/src/main/java/com/cm/socket/client/handler/MessageClientHandler.java
new file mode 100644
index 0000000..ed11e74
--- /dev/null
+++ b/cloud-common-socket-client/src/main/java/com/cm/socket/client/handler/MessageClientHandler.java
@@ -0,0 +1,37 @@
+package com.cm.socket.client.handler;
+
+import com.cm.socket.client.service.AbstractMessageClientService;
+import com.cm.socket.pojo.Message;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: MessageClientHandler
+ * @Description: 消息客户端处理器
+ * @Author: WangGeng
+ * @Date: 2020/7/6 9:34 上午
+ * @Version: 1.0
+ **/
+public class MessageClientHandler extends SimpleChannelInboundHandler {
+
+ private AbstractMessageClientService abstractMessageClientService;
+
+ public MessageClientHandler(AbstractMessageClientService abstractMessageClientService) {
+ this.abstractMessageClientService = abstractMessageClientService;
+ }
+
+ @Override
+ public void channelActive(ChannelHandlerContext ctx) throws Exception {
+ super.channelActive(ctx);
+ abstractMessageClientService.setChannelHandlerContext(ctx);
+ }
+
+ @Override
+ protected void channelRead0(ChannelHandlerContext ctx, Message msg) throws Exception {
+ abstractMessageClientService.readMessage(msg.getContent());
+ }
+
+}
diff --git a/cloud-common-socket-client/src/main/java/com/cm/socket/client/handler/MessageClientPingHandler.java b/cloud-common-socket-client/src/main/java/com/cm/socket/client/handler/MessageClientPingHandler.java
new file mode 100644
index 0000000..fbb9f18
--- /dev/null
+++ b/cloud-common-socket-client/src/main/java/com/cm/socket/client/handler/MessageClientPingHandler.java
@@ -0,0 +1,104 @@
+package com.cm.socket.client.handler;
+
+import com.cm.socket.client.MessageSocketClient;
+import com.cm.socket.client.config.MessageSocketClientConfig;
+import com.cm.socket.enums.SocketMessageEnum;
+import com.cm.socket.pojo.Message;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.util.concurrent.ScheduledFuture;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: MessageClientPingHandler
+ * @Description: 客户端ping
+ * @Author: WangGeng
+ * @Date: 2020/7/6 9:43 上午
+ * @Version: 1.0
+ **/
+public class MessageClientPingHandler extends SimpleChannelInboundHandler {
+
+ private MessageSocketClientConfig messageSocketClientConfig;
+ private MessageSocketClient messageSocketClient;
+
+ public MessageClientPingHandler(MessageSocketClient messageSocketClient, MessageSocketClientConfig messageSocketClientConfig) {
+ this.messageSocketClient = messageSocketClient;
+ this.messageSocketClientConfig = messageSocketClientConfig;
+ }
+
+ @Override
+ public void channelActive(ChannelHandlerContext ctx) throws Exception {
+ System.out.println("服务器连接成功");
+ messageSocketClient.setCurrentReconnectCount(1);
+ messageSocketClient.setCurrentReconnectTime(1);
+ super.channelActive(ctx);
+ ping(ctx.channel());
+ }
+
+ @Override
+ protected void channelRead0(ChannelHandlerContext ctx, Message msg) throws Exception {
+ if (msg.getStart() != SocketMessageEnum.MESSAGE_TYPE_START.getType()) {
+ return;
+ }
+ if (msg.getType() == SocketMessageEnum.MESSAGE_TYPE_PONG.getType()) {
+ System.out.println("server pong");
+ return;
+ }
+ ctx.fireChannelRead(msg);
+ }
+
+ /**
+ * ping
+ *
+ * @param channel
+ */
+ private void ping(Channel channel) {
+ ScheduledFuture scheduledFuture = channel.eventLoop().schedule(() -> {
+ if (channel.isActive()) {
+ Message ping = new Message();
+ ping.setStart(SocketMessageEnum.MESSAGE_TYPE_START.getType());
+ ping.setType(SocketMessageEnum.MESSAGE_TYPE_PING.getType());
+ ping.setContent(SocketMessageEnum.MESSAGE_PING.getMessage());
+ channel.writeAndFlush(ping);
+ } else {
+ channel.closeFuture();
+ throw new RuntimeException();
+ }
+ }, messageSocketClientConfig.getDelayPingSeconds(), TimeUnit.SECONDS);
+ scheduledFuture.addListener(future -> {
+ if (future.isSuccess()) {
+ ping(channel);
+ }
+ });
+ }
+
+ @Override
+ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+ System.err.println("连接断开");
+ int currentReconnectCount = messageSocketClient.getCurrentReconnectCount();
+ int waitTime = messageSocketClient.getCurrentReconnectTime();
+ if (messageSocketClient.getCurrentReconnectCount() > this.messageSocketClientConfig.getMaxReconnectCount()) {
+ System.out.println("服务器重连失败");
+ throw new RuntimeException();
+ }
+ System.out.println(waitTime + "s后进行第" + currentReconnectCount + "次重连");
+ ctx.channel().eventLoop().schedule(() -> {
+ MessageSocketClient.getInstance().run();
+ }, waitTime, TimeUnit.SECONDS);
+ messageSocketClient.setCurrentReconnectCount(++currentReconnectCount);
+ if (messageSocketClientConfig.getReconnectTimeStep() > 0) {
+ messageSocketClient.setCurrentReconnectTime(waitTime + messageSocketClientConfig.getReconnectTimeStep());
+ }
+ }
+
+ @Override
+ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+ cause.printStackTrace();
+ ctx.close();
+ }
+}
diff --git a/cloud-common-socket-client/src/main/java/com/cm/socket/client/service/AbstractMessageClientService.java b/cloud-common-socket-client/src/main/java/com/cm/socket/client/service/AbstractMessageClientService.java
new file mode 100644
index 0000000..013eb03
--- /dev/null
+++ b/cloud-common-socket-client/src/main/java/com/cm/socket/client/service/AbstractMessageClientService.java
@@ -0,0 +1,49 @@
+package com.cm.socket.client.service;
+
+import com.cm.socket.enums.SocketMessageEnum;
+import com.cm.socket.pojo.Message;
+import io.netty.channel.ChannelHandlerContext;
+
+import java.nio.channels.Channel;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: IMessageClientService
+ * @Description: 客户端消息业务接口
+ * @Author: WangGeng
+ * @Date: 2020/7/6 10:50 上午
+ * @Version: 1.0
+ **/
+public abstract class AbstractMessageClientService {
+
+ protected ChannelHandlerContext channelHandlerContext;
+
+ /**
+ * 发送消息
+ *
+ * @param sendMessage
+ */
+ public void sendMessage(String sendMessage) {
+ if (sendMessage == null || sendMessage.isEmpty()) {
+ return;
+ }
+ Message message = new Message();
+ message.setStart(SocketMessageEnum.MESSAGE_TYPE_START.getType());
+ message.setType(SocketMessageEnum.MESSAGE_TYPE_MESSAGE.getType());
+ message.setContent(sendMessage);
+ channelHandlerContext.writeAndFlush(message);
+ }
+
+ /**
+ * 读取消息
+ *
+ * @param message
+ */
+ public abstract void readMessage(String message);
+
+ public void setChannelHandlerContext(ChannelHandlerContext channelHandlerContext) {
+ this.channelHandlerContext = channelHandlerContext;
+ }
+}
diff --git a/cloud-common-socket/pom.xml b/cloud-common-socket/pom.xml
index f462f45..d3fcfe9 100644
--- a/cloud-common-socket/pom.xml
+++ b/cloud-common-socket/pom.xml
@@ -12,6 +12,11 @@
cloud-common-socket
+
+ com.cm
+ cloud-common
+ 1.0.1-SNAPSHOT
+
io.netty
netty-all
diff --git a/cloud-common-socket/src/main/java/com/cm/socket/Client.java b/cloud-common-socket/src/main/java/com/cm/socket/Client.java
index 45600d0..92c72fd 100644
--- a/cloud-common-socket/src/main/java/com/cm/socket/Client.java
+++ b/cloud-common-socket/src/main/java/com/cm/socket/Client.java
@@ -8,6 +8,14 @@ import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.timeout.IdleState;
+import io.netty.handler.timeout.IdleStateEvent;
+import io.netty.handler.timeout.IdleStateHandler;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import io.netty.util.concurrent.ScheduledFuture;
+
+import java.util.concurrent.TimeUnit;
/**
* When you feel like quitting. Think about why you started
@@ -32,21 +40,65 @@ public class Client {
bootstrap.handler(new ChannelInitializer() {
@Override
protected void initChannel(SocketChannel ch) throws Exception {
+ ch.pipeline().addLast(new ChannelInboundHandlerAdapter() {
+ @Override
+ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+ System.out.println("服务器连接失败");
+ super.channelInactive(ctx);
+ }
+ });
ch.pipeline().addLast(new MessageEncoder());
ch.pipeline().addLast(new MessageDecoder());
ch.pipeline().addLast(new SimpleChannelInboundHandler() {
+
+ @Override
+ public void channelActive(ChannelHandlerContext ctx) throws Exception {
+ super.channelActive(ctx);
+ ping(ctx.channel());
+ }
+
+ private void ping(Channel channel) {
+ ScheduledFuture schedule = channel.eventLoop().schedule(new Runnable() {
+ @Override
+ public void run() {
+ if (channel.isActive()) {
+ System.out.println("向服务器发送ping");
+ Message ping = new Message();
+ ping.setStart((byte) 0x01);
+ ping.setType((byte) 0x01);
+ ping.setContent("ping");
+ channel.writeAndFlush(ping);
+ } else {
+ System.err.println("连接断开");
+ channel.closeFuture();
+ throw new RuntimeException();
+ }
+ }
+ }, 3, TimeUnit.SECONDS);
+ schedule.addListener(new GenericFutureListener() {
+ @Override
+ public void operationComplete(Future future) throws Exception {
+ if (future.isSuccess()) {
+ ping(channel);
+ }
+ }
+ });
+ }
+
@Override
protected void channelRead0(ChannelHandlerContext ctx, Message msg) throws Exception {
System.out.println(msg.getContent());
- if(sendCount[0] < 4) {
- Thread.sleep(5000);
- Message message = new Message();
- message.setStart((byte) 0x01);
- message.setType((byte) 0x02);
- message.setContent("你好服务器"+ sendCount[0] +"!");
- ctx.channel().writeAndFlush(message);
- sendCount[0]++;
- }
+// if (sendCount[0] < 4) {
+// Thread.sleep(5000);
+// Message message = new Message();
+// message.setStart((byte) 0x01);
+// message.setType((byte) 0x02);
+// message.setContent("你好服务器" + sendCount[0] + "!");
+// ctx.channel().writeAndFlush(message);
+// sendCount[0]++;
+// } else {
+// ctx.close();
+// }
}
@Override
@@ -55,9 +107,17 @@ public class Client {
ctx.close();
}
});
+
+ }
+ });
+ ChannelFuture channelFuture = bootstrap.connect("localhost", 9999).addListener(new ChannelFutureListener() {
+ @Override
+ public void operationComplete(ChannelFuture future) throws Exception {
+ if (!future.isSuccess()) {
+ future.channel().pipeline().fireChannelInactive();
+ }
}
});
- ChannelFuture channelFuture = bootstrap.connect("localhost", 9999).sync();
Message message = new Message();
message.setStart((byte) 0x01);
message.setType((byte) 0x02);
diff --git a/cloud-common-socket/src/main/java/com/cm/socket/consts/ISocketConst.java b/cloud-common-socket/src/main/java/com/cm/socket/consts/ISocketConst.java
new file mode 100644
index 0000000..90e0386
--- /dev/null
+++ b/cloud-common-socket/src/main/java/com/cm/socket/consts/ISocketConst.java
@@ -0,0 +1,15 @@
+package com.cm.socket.consts;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: ISocketConsts
+ * @Description: socket常量
+ * @Author: WangGeng
+ * @Date: 2020/7/6 9:15 上午
+ * @Version: 1.0
+ **/
+public interface ISocketConst {
+
+}
diff --git a/cloud-common-socket/src/main/java/com/cm/socket/decoder/MessageDecoder.java b/cloud-common-socket/src/main/java/com/cm/socket/decoder/MessageDecoder.java
index 1cedcfa..9278516 100644
--- a/cloud-common-socket/src/main/java/com/cm/socket/decoder/MessageDecoder.java
+++ b/cloud-common-socket/src/main/java/com/cm/socket/decoder/MessageDecoder.java
@@ -4,6 +4,7 @@ import com.cm.socket.pojo.Message;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.util.CharsetUtil;
import java.nio.charset.Charset;
import java.util.List;
@@ -26,6 +27,9 @@ public class MessageDecoder extends ByteToMessageDecoder {
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List