From dec15eb9130e1984d901bd0df8bfc36ceb072c3a Mon Sep 17 00:00:00 2001 From: zc Date: Wed, 11 Mar 2026 17:53:58 +0800 Subject: [PATCH] =?UTF-8?q?tcp=E6=9C=8D=E5=8A=A1=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller}/tcp/config/NettyTcpServer.java | 9 ++++----- .../controller}/tcp/config/SimpleRequestMatcher.java | 2 +- .../admin/controller}/tcp/handler/TcpServerHandler.java | 8 ++++---- .../admin/controller}/tcp/manager/ChannelManager.java | 2 +- .../wms/admin/controller}/tcp/model/CommandRequest.java | 2 +- .../top/wms/admin/controller}/tcp/model/VMResult.java | 2 +- .../admin/controller}/tcp/service/CommandService.java | 4 ++-- .../admin/controller}/tcp/util/SpringContextUtil.java | 2 +- .../controller/{tcp => vm}/VmCommandController.java | 6 +++--- 9 files changed, 18 insertions(+), 19 deletions(-) rename {wms-module-system/src/main/java/top/wms/admin => wms-webapi/src/main/java/top/wms/admin/controller}/tcp/config/NettyTcpServer.java (94%) rename {wms-module-system/src/main/java/top/wms/admin => wms-webapi/src/main/java/top/wms/admin/controller}/tcp/config/SimpleRequestMatcher.java (97%) rename {wms-module-system/src/main/java/top/wms/admin => wms-webapi/src/main/java/top/wms/admin/controller}/tcp/handler/TcpServerHandler.java (89%) rename {wms-module-system/src/main/java/top/wms/admin => wms-webapi/src/main/java/top/wms/admin/controller}/tcp/manager/ChannelManager.java (96%) rename {wms-module-system/src/main/java/top/wms/admin => wms-webapi/src/main/java/top/wms/admin/controller}/tcp/model/CommandRequest.java (92%) rename {wms-module-system/src/main/java/top/wms/admin => wms-webapi/src/main/java/top/wms/admin/controller}/tcp/model/VMResult.java (93%) rename {wms-module-system/src/main/java/top/wms/admin => wms-webapi/src/main/java/top/wms/admin/controller}/tcp/service/CommandService.java (94%) rename {wms-module-system/src/main/java/top/wms/admin => wms-webapi/src/main/java/top/wms/admin/controller}/tcp/util/SpringContextUtil.java (93%) rename wms-webapi/src/main/java/top/wms/admin/controller/{tcp => vm}/VmCommandController.java (93%) diff --git a/wms-module-system/src/main/java/top/wms/admin/tcp/config/NettyTcpServer.java b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/NettyTcpServer.java similarity index 94% rename from wms-module-system/src/main/java/top/wms/admin/tcp/config/NettyTcpServer.java rename to wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/NettyTcpServer.java index f48e624..c84e76e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/tcp/config/NettyTcpServer.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/NettyTcpServer.java @@ -1,6 +1,8 @@ -package top.wms.admin.tcp.config; +package top.wms.admin.controller.tcp.config; -import top.wms.admin.tcp.handler.TcpServerHandler; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import top.wms.admin.controller.tcp.handler.TcpServerHandler; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; @@ -14,9 +16,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - @Slf4j @Component public class NettyTcpServer { diff --git a/wms-module-system/src/main/java/top/wms/admin/tcp/config/SimpleRequestMatcher.java b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/SimpleRequestMatcher.java similarity index 97% rename from wms-module-system/src/main/java/top/wms/admin/tcp/config/SimpleRequestMatcher.java rename to wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/SimpleRequestMatcher.java index 917d210..fc39cf1 100644 --- a/wms-module-system/src/main/java/top/wms/admin/tcp/config/SimpleRequestMatcher.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/config/SimpleRequestMatcher.java @@ -1,4 +1,4 @@ -package top.wms.admin.tcp.config; +package top.wms.admin.controller.tcp.config; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/wms-module-system/src/main/java/top/wms/admin/tcp/handler/TcpServerHandler.java b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/handler/TcpServerHandler.java similarity index 89% rename from wms-module-system/src/main/java/top/wms/admin/tcp/handler/TcpServerHandler.java rename to wms-webapi/src/main/java/top/wms/admin/controller/tcp/handler/TcpServerHandler.java index 9ab6558..0c7f948 100644 --- a/wms-module-system/src/main/java/top/wms/admin/tcp/handler/TcpServerHandler.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/handler/TcpServerHandler.java @@ -1,8 +1,8 @@ -package top.wms.admin.tcp.handler; +package top.wms.admin.controller.tcp.handler; -import top.wms.admin.tcp.config.SimpleRequestMatcher; -import top.wms.admin.tcp.manager.ChannelManager; -import top.wms.admin.tcp.util.SpringContextUtil; +import top.wms.admin.controller.tcp.config.SimpleRequestMatcher; +import top.wms.admin.controller.tcp.util.SpringContextUtil; +import top.wms.admin.controller.tcp.manager.ChannelManager; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import lombok.extern.slf4j.Slf4j; diff --git a/wms-module-system/src/main/java/top/wms/admin/tcp/manager/ChannelManager.java b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/manager/ChannelManager.java similarity index 96% rename from wms-module-system/src/main/java/top/wms/admin/tcp/manager/ChannelManager.java rename to wms-webapi/src/main/java/top/wms/admin/controller/tcp/manager/ChannelManager.java index 90e494b..51077b5 100644 --- a/wms-module-system/src/main/java/top/wms/admin/tcp/manager/ChannelManager.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/manager/ChannelManager.java @@ -1,4 +1,4 @@ -package top.wms.admin.tcp.manager; +package top.wms.admin.controller.tcp.manager; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; diff --git a/wms-module-system/src/main/java/top/wms/admin/tcp/model/CommandRequest.java b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/CommandRequest.java similarity index 92% rename from wms-module-system/src/main/java/top/wms/admin/tcp/model/CommandRequest.java rename to wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/CommandRequest.java index 4a313ef..1172ce4 100644 --- a/wms-module-system/src/main/java/top/wms/admin/tcp/model/CommandRequest.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/CommandRequest.java @@ -1,4 +1,4 @@ -package top.wms.admin.tcp.model; +package top.wms.admin.controller.tcp.model; import lombok.Data; import lombok.AllArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/tcp/model/VMResult.java b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/VMResult.java similarity index 93% rename from wms-module-system/src/main/java/top/wms/admin/tcp/model/VMResult.java rename to wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/VMResult.java index 379fe16..f6b33be 100644 --- a/wms-module-system/src/main/java/top/wms/admin/tcp/model/VMResult.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/model/VMResult.java @@ -1,4 +1,4 @@ -package top.wms.admin.tcp.model; +package top.wms.admin.controller.tcp.model; import lombok.Data; import lombok.AllArgsConstructor; diff --git a/wms-module-system/src/main/java/top/wms/admin/tcp/service/CommandService.java b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/service/CommandService.java similarity index 94% rename from wms-module-system/src/main/java/top/wms/admin/tcp/service/CommandService.java rename to wms-webapi/src/main/java/top/wms/admin/controller/tcp/service/CommandService.java index d52580b..14e644c 100644 --- a/wms-module-system/src/main/java/top/wms/admin/tcp/service/CommandService.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/service/CommandService.java @@ -1,6 +1,6 @@ -package top.wms.admin.tcp.service; +package top.wms.admin.controller.tcp.service; -import top.wms.admin.tcp.model.VMResult; +import top.wms.admin.controller.tcp.model.VMResult; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/wms-module-system/src/main/java/top/wms/admin/tcp/util/SpringContextUtil.java b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/util/SpringContextUtil.java similarity index 93% rename from wms-module-system/src/main/java/top/wms/admin/tcp/util/SpringContextUtil.java rename to wms-webapi/src/main/java/top/wms/admin/controller/tcp/util/SpringContextUtil.java index 049259c..06de1ca 100644 --- a/wms-module-system/src/main/java/top/wms/admin/tcp/util/SpringContextUtil.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/tcp/util/SpringContextUtil.java @@ -1,4 +1,4 @@ -package top.wms.admin.tcp.util; +package top.wms.admin.controller.tcp.util; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/VmCommandController.java b/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java similarity index 93% rename from wms-webapi/src/main/java/top/wms/admin/controller/tcp/VmCommandController.java rename to wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java index 9333fd4..9c85a5f 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/tcp/VmCommandController.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java @@ -1,11 +1,11 @@ -package top.wms.admin.controller.tcp; +package top.wms.admin.controller.vm; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import top.wms.admin.tcp.config.SimpleRequestMatcher; -import top.wms.admin.tcp.manager.ChannelManager; +import top.wms.admin.controller.tcp.config.SimpleRequestMatcher; +import top.wms.admin.controller.tcp.manager.ChannelManager; @Slf4j @RestController