From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/nettyServer/Server.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/nettyServer/Server.java b/src/main/java/org/springblade/modules/nettyServer/Server.java
index b982278..454bf81 100644
--- a/src/main/java/org/springblade/modules/nettyServer/Server.java
+++ b/src/main/java/org/springblade/modules/nettyServer/Server.java
@@ -9,6 +9,9 @@
import io.netty.channel.socket.ServerSocketChannel;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
public class Server {
private int port;
@@ -85,8 +88,8 @@
serverSocketChannel.writeAndFlush(msg);
}
}
-/*
- public static void main(String[] args) {
- Server server = new Server(8088);
- }*/
+
+// public static void main(String[] args) {
+//// Server server = new Server(8088);
+//// }
}
--
Gitblit v1.9.3