From 38b405be7e48ce815abe5290b523dbf11152c1ed Mon Sep 17 00:00:00 2001
From: htjcAdmin <qinyanlei@ht-atia.com>
Date: Thu, 6 Mar 2025 09:49:07 +0800
Subject: [PATCH] =?UTF-8?q?/*=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E3=80=82*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspect/tcpserver/tcp/NettyServer.java    |  3 +-
 src/main/resources/application-test.yml       | 10 ++---
 src/main/resources/application.yml            | 43 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
index d7f51ce..835c44e 100644
--- a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
+++ b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
@@ -140,7 +140,7 @@ public class NettyServer {
 
     //发送消息
     public void sendMsg(String client, boolean request, String xml) {
-        logger.info("[NETTY] Client: {} online: {}", client, clients.containsKey(client));
+        logger.info("[NETTY] Client: {} online: {}, xml: \n {}", client, clients.containsKey(client), xml);
         if (clients.containsKey(client) && !StringUtil.isNullOrEmpty(xml)) {
             ByteBuf byteBuf = Unpooled.copiedBuffer(xml, CharsetUtil.UTF_8);
             int length = byteBuf.readableBytes();
@@ -154,7 +154,6 @@ public class NettyServer {
             allBuf.writeBytes(byteBuf);
             allBuf.writeByte(0xEB);
             allBuf.writeByte(0x90);
-
             redisTemplate.opsForValue().set(String.valueOf(sendIndex), allBuf.toString(CharsetUtil.US_ASCII), 60L, TimeUnit.SECONDS);
             nettyServerHandler.SendMsg(clients.get(client), allBuf);
             logger.info("[NETTY] 向设备端机器人发送消息会话序列号: [{}], 接收端序列号: [{}]", sendIndex, receiveIndex);
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index fcbf90b..ed0914a 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -17,16 +17,16 @@ server:
 deviceServer:
   serverIp: 127.0.0.1
   serverPort: 10011
-  deviceServerCode: "192.168.1.66"
-  robotCode: "192.168.1.15"
-  nestCode: "192.168.1.16"
-  deviceCode: "192.168.1.15"
+  deviceServerCode: "INSPECT-SERVER-001"
+  robotCode: "DRONE-001"
+  nestCode: "NEST-001"
+  deviceCode: "DRONE-001"
 
 upSystemServer:
   serverIp: 10.10.18.100
   serverPort: 10011
   upCode: "192.168.1.99"
-  iipCode: "192.168.1.66"
+  iipCode: "INSPECT-SERVER-001"
 
 iip_server:
   send:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9f96606..51272cc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,42 @@
 spring:
-  profiles:
-    active: prod
+  application:
+    name: tcpServer
+  redis:
+    host: 199.199.199.1
+
+  rabbitmq:
+    host: 199.199.199.4
+    port: 5672
+    username: guest
+    password: guest
+
+
+server:
+  port: 22508
+
+deviceServer:
+  serverIp: 127.0.0.1
+  serverPort: 10011
+  deviceServerCode: "192.168.1.116"
+  robotCode: "192.168.1.15"
+  nestCode: "192.168.1.16"
+  deviceCode: "192.168.1.15"
+
+upSystemServer:
+  serverIp: 10.10.18.100
+  serverPort: 10011
+  upCode: "192.168.1.99"
+  iipCode: "192.168.1.66"
+
+iip_server:
+  send:
+    url: http://199.199.199.104:9901/client/send
+  authDevice:
+    url: http://199.199.199.105:9902/eqpbook/checkPatrolDeviceIsExist/%s
+
+up_time_interval_setting: time_interval_up_system_setting
+
+boot:
+  client: true
+  server: true
+