From 745d5b90be7d8cdb8873b18d18b286fdc4b6913b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 05 十二月 2023 10:13:57 +0800
Subject: [PATCH] 配置文件全部更改为配置类 优化包路径
---
src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ard/utils/tcp/ClientInitialize.java b/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
similarity index 93%
rename from src/main/java/com/ard/utils/tcp/ClientInitialize.java
rename to src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
index 89a5cf7..c661f52 100644
--- a/src/main/java/com/ard/utils/tcp/ClientInitialize.java
+++ b/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
@@ -1,4 +1,4 @@
-package com.ard.utils.tcp;
+package com.ard.utils.netty.tcp;
/**
* @Description:
@@ -10,19 +10,18 @@
import com.ard.alarm.radar.domain.ArdEquipRadar;
import com.ard.alarm.radar.service.IArdEquipRadarService;
+import com.ard.utils.netty.config.NettyTcpConfiguration;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.CompletableFuture;
@@ -39,12 +38,10 @@
@Slf4j(topic = "netty")
@Order(2)
public class ClientInitialize implements ApplicationRunner {
-
+ @Resource
+ NettyTcpConfiguration nettyTcpConfig;
@Resource
IArdEquipRadarService ardEquipRadarService;
-
- @Value("${spring.netty.tcp.enabled}")
- private Boolean tcpClientEnable;
private Bootstrap bootstrap;
public static CopyOnWriteArraySet<ArdEquipRadar> falseConnectSet = new CopyOnWriteArraySet();
@@ -127,7 +124,7 @@
*/
@Override
public void run(ApplicationArguments args) {
- if (!tcpClientEnable) {
+ if (!nettyTcpConfig.getEnabled()) {
return;
}
initNettyTcp();//鍒濆鍖杗ettyTcp
@@ -135,7 +132,7 @@
for (ArdEquipRadar ardEquipRadar : ardEquipRadars) {
String host = ardEquipRadar.getIp();
Integer port = Integer.valueOf(ardEquipRadar.getPort());
- log.debug("TCP client try to connect radar銆愶細" + host + ":" + port+"銆�");
+ log.debug("TCP client try to connect radar銆�" + host + ":" + port+"銆�");
connectServer(ardEquipRadar);//杩炴帴姣忎竴涓浄杈炬湇鍔�
}
}
--
Gitblit v1.9.3