diff --git a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/ChannelRepository.java b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/ChannelRepository.java index fcd2243..2755879 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/ChannelRepository.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/ChannelRepository.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * Created by 1-point at 2021/9/8 + * 客户端IP和通信信道的映射 */ @Component @Slf4j diff --git a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServer.java b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServer.java index 8515103..f597647 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServer.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServer.java @@ -15,7 +15,7 @@ import javax.annotation.Resource; import java.net.InetSocketAddress; /** - * Created by 1-point at 2021/9/7 + * netty服务端初始化 */ @Component @Slf4j @@ -38,21 +38,21 @@ public class NettyServer { @PostConstruct public void start() throws InterruptedException { - boss= new NioEventLoopGroup(serverProperties.getBossThreadCount()); + boss = new NioEventLoopGroup(serverProperties.getBossThreadCount()); worker = new NioEventLoopGroup(serverProperties.getWorkerThreadCount()); ServerBootstrap bootstrap = new ServerBootstrap(); bootstrap.group(boss, worker) - // 指定Channel - .channel(NioServerSocketChannel.class) - //使用指定的端口设置套接字地址 - .localAddress(new InetSocketAddress(serverProperties.getPort())) - //服务端可连接队列数,对应TCP/IP协议listen函数中backlog参数 - .option(ChannelOption.SO_BACKLOG, 1024) - //设置TCP长连接,一般如果两个小时内没有数据的通信时,TCP会自动发送一个活动探测数据报文 - .childOption(ChannelOption.SO_KEEPALIVE, true) - //将小的数据包包装成更大的帧进行传送,提高网络的负载 - .childOption(ChannelOption.TCP_NODELAY, true) - .childHandler(serverInitializer); + // 指定Channel + .channel(NioServerSocketChannel.class) + //使用指定的端口设置套接字地址 + .localAddress(new InetSocketAddress(serverProperties.getPort())) + //服务端可连接队列数,对应TCP/IP协议listen函数中backlog参数 + .option(ChannelOption.SO_BACKLOG, 1024) + //设置TCP长连接,一般如果两个小时内没有数据的通信时,TCP会自动发送一个活动探测数据报文 + .childOption(ChannelOption.SO_KEEPALIVE, true) + //将小的数据包包装成更大的帧进行传送,提高网络的负载 + .childOption(ChannelOption.TCP_NODELAY, true) + .childHandler(serverInitializer); ChannelFuture future = bootstrap.bind().sync(); if (future.isSuccess()) { log.info("Start netty server successfully"); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerInitializer.java b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerInitializer.java index 88b8f22..e4585f4 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerInitializer.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerInitializer.java @@ -16,7 +16,7 @@ import javax.annotation.Resource; import java.util.concurrent.TimeUnit; /** - * Created by 1-point at 2021/9/7 + * netty服务端信道初始化 */ @Component public class NettyServerInitializer extends ChannelInitializer { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerProperties.java b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerProperties.java index a8487e1..02f515d 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerProperties.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerProperties.java @@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; /** - * Created by 1-point at 2021/9/7 + * netty服务端配置 */ @Data @Component diff --git a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyBusinessHandler.java b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyBusinessHandler.java index 1f5796a..ca77e1a 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyBusinessHandler.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyBusinessHandler.java @@ -13,7 +13,7 @@ import javax.annotation.Resource; import java.net.InetSocketAddress; /** - * Created by 1-point at 2021/9/7 + * 业务消息处理 */ @Slf4j @ChannelHandler.Sharable diff --git a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyHeartbeatHandler.java b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyHeartbeatHandler.java index 5027bb4..cdc737d 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyHeartbeatHandler.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyHeartbeatHandler.java @@ -11,7 +11,7 @@ import io.netty.util.ReferenceCountUtil; import lombok.extern.slf4j.Slf4j; /** - * Created by 1-point at 2021/9/8 + * 客户端和服务端心跳 */ @Slf4j @ChannelHandler.Sharable diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/TaskCollectorServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/TaskCollectorServiceImpl.java index 2659917..0242127 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/TaskCollectorServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/TaskCollectorServiceImpl.java @@ -17,7 +17,7 @@ import java.util.List; *

* * @author AutoGenerator - * @since 2023-07-10 + * @since 2023-07-07 */ @Service public class TaskCollectorServiceImpl implements ITaskCollectorService { diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/process/RetryProcessor.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/process/RetryProcessor.java index a9d172a..41b15fb 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/process/RetryProcessor.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/process/RetryProcessor.java @@ -62,12 +62,16 @@ public class RetryProcessor extends AbstractProcessor { if (error) { taskConfigRetryLog.setLastErrorMsg(context.getExMessageResult()); taskConfigRetryLog.setState(StateEnum.FAIL); + taskConfigRetryLog.setCreateTime(new Date()); + taskConfigRetryLog.setUpdateTime(new Date()); taskConfigDO.setState(StateEnum.FAIL); taskConfigDO.setCreateTime(new Date()); taskConfigDO.setUpdateTime(new Date()); } else { taskConfigRetryLog.setLastErrorMsg(EMPTY_STRING); taskConfigRetryLog.setState(StateEnum.OK); + taskConfigRetryLog.setCreateTime(new Date()); + taskConfigRetryLog.setUpdateTime(new Date()); taskConfigDO.setState(StateEnum.OK); taskConfigDO.setCreateTime(new Date()); taskConfigDO.setUpdateTime(new Date()); @@ -84,12 +88,16 @@ public class RetryProcessor extends AbstractProcessor { if (error) { taskMessageRetryLog.setErrorMsg(context.getExMessageResult()); taskMessageRetryLog.setState(StateEnum.FAIL); + taskMessageRetryLog.setCreateTime(new Date()); + taskMessageRetryLog.setUpdateTime(new Date()); taskMessageDO.setState(StateEnum.FAIL); taskMessageDO.setCreateTime(new Date()); taskMessageDO.setUpdateTime(new Date()); } else { taskMessageRetryLog.setErrorMsg(EMPTY_STRING); taskMessageRetryLog.setState(StateEnum.OK); + taskMessageRetryLog.setCreateTime(new Date()); + taskMessageRetryLog.setUpdateTime(new Date()); taskMessageDO.setState(StateEnum.OK); taskMessageDO.setCreateTime(new Date()); taskMessageDO.setUpdateTime(new Date());