From c17dfde4e2d4f73aeab8e5094c39e30c7f87ee80 Mon Sep 17 00:00:00 2001 From: chuzhongzai Date: Sat, 6 Jan 2024 14:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A5=E5=BF=97;=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=AB=AF=E5=8F=A3;=E8=B0=83=E6=95=B4=E7=BD=91?= =?UTF-8?q?=E5=8D=A1=E5=90=8D=E5=AD=97=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lion/snss/service/CommunicateToMainService.java | 6 ++---- .../com/lion/snss/service/CommunicateToSiteService.java | 4 +--- src/main/java/com/lion/snss/util/IoUtil.java | 3 +-- src/main/resources/application.yaml | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/lion/snss/service/CommunicateToMainService.java b/src/main/java/com/lion/snss/service/CommunicateToMainService.java index ecc75ab..99ed963 100644 --- a/src/main/java/com/lion/snss/service/CommunicateToMainService.java +++ b/src/main/java/com/lion/snss/service/CommunicateToMainService.java @@ -16,8 +16,6 @@ import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import io.netty.handler.logging.LogLevel; -import io.netty.handler.logging.LoggingHandler; import io.netty.util.concurrent.DefaultPromise; import io.netty.util.concurrent.Promise; import jakarta.annotation.Resource; @@ -137,7 +135,7 @@ public class CommunicateToMainService { protected void initChannel(NioSocketChannel channel) { channel.pipeline().addLast(new LengthFieldBasedFrameDecoder(100000000, 4, 4)); channel.pipeline().addLast(new MessageCodec()); - channel.pipeline().addLast(new LoggingHandler(LogLevel.INFO)); +// channel.pipeline().addLast(new LoggingHandler(LogLevel.WARN)); channel.pipeline().addLast(new MyChannelInboundHandlerAdapter()); } }).connect(ip, 7777).sync(); @@ -160,7 +158,7 @@ public class CommunicateToMainService { protected void initChannel(NioSocketChannel channel) { channel.pipeline().addLast(new LengthFieldBasedFrameDecoder(100000000, 4, 4)); channel.pipeline().addLast(new MessageCodec()); - channel.pipeline().addLast(new LoggingHandler(LogLevel.INFO)); +// channel.pipeline().addLast(new LoggingHandler(LogLevel.WARN)); channel.pipeline().addLast(new MyChannelInboundHandlerAdapter()); } }).connect(ip, 9999).sync(); diff --git a/src/main/java/com/lion/snss/service/CommunicateToSiteService.java b/src/main/java/com/lion/snss/service/CommunicateToSiteService.java index 758795b..03c2e4f 100644 --- a/src/main/java/com/lion/snss/service/CommunicateToSiteService.java +++ b/src/main/java/com/lion/snss/service/CommunicateToSiteService.java @@ -11,8 +11,6 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import io.netty.handler.logging.LogLevel; -import io.netty.handler.logging.LoggingHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -44,7 +42,7 @@ public class CommunicateToSiteService { protected void initChannel(NioSocketChannel ch) { ch.pipeline().addLast(new LengthFieldBasedFrameDecoder(10000000, 4, 4)); ch.pipeline().addLast(new MessageCodec()); - ch.pipeline().addLast(new LoggingHandler(LogLevel.INFO)); +// ch.pipeline().addLast(new LoggingHandler(LogLevel.WARN)); ch.pipeline().addLast(new MyChannelInBoundHandlerAdapter()); } }).bind(9999); diff --git a/src/main/java/com/lion/snss/util/IoUtil.java b/src/main/java/com/lion/snss/util/IoUtil.java index 8916d5d..67ee092 100644 --- a/src/main/java/com/lion/snss/util/IoUtil.java +++ b/src/main/java/com/lion/snss/util/IoUtil.java @@ -3,7 +3,6 @@ package com.lion.snss.util; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; -import cn.hutool.system.SystemUtil; import cn.hutool.system.oshi.CpuInfo; import cn.hutool.system.oshi.OshiUtil; import com.lion.snss.message.StatusMessage; @@ -62,7 +61,7 @@ public class IoUtil { globalMemory = OshiUtil.getMemory(); for (NetworkIF nif : networkIFs) - if (nif.getName().startsWith("eth") || nif.getName().startsWith("ens")) { + if (nif.getName().startsWith("eth0") || nif.getName().startsWith("ens")) { networkIF = nif; break; } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 1b51bf8..dce3a25 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -17,7 +17,7 @@ spring: max-request-size: 10000MB enabled: true server: - port: 8080 + port: 7777 error: include-message: always