From aec6fd595827bb82d5a41d51cb9e957bd2031f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Tue, 21 Jun 2022 16:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9udp=20=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E8=A7=A3=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/NettyUDPServerHandler.java        | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/netty/server/controlserver/handler/NettyUDPServerHandler.java b/device-manager/src/main/java/com/mortals/xhx/daemon/netty/server/controlserver/handler/NettyUDPServerHandler.java
index 488634f4..d4517157 100644
--- a/device-manager/src/main/java/com/mortals/xhx/daemon/netty/server/controlserver/handler/NettyUDPServerHandler.java
+++ b/device-manager/src/main/java/com/mortals/xhx/daemon/netty/server/controlserver/handler/NettyUDPServerHandler.java
@@ -43,29 +43,37 @@ public class NettyUDPServerHandler extends SimpleChannelInboundHandler<DatagramP
         byte[] bytes = new byte[byteBuf.readableBytes()];
         byteBuf.readBytes(bytes);
         String content = new String(bytes);
-        content = EncryptUtil.decrypt(content, ENCRYPT_STR);
+        ApiResp<String> resp = new ApiResp<>();
+        resp.setCode(YesNoEnum.YES.getValue());
+        log.info("receive->UDP entbefore:{}", packet.sender().toString() + "," + content);
+        try {
+            content = EncryptUtil.myEnscrt(content, 9, "FZV1D&tr", "w4*KbUamPdZDnDpG");
+            //EncryptUtil.decrypt(content, ENCRYPT_STR);
+            log.info("receive->UDPafter:{}", packet.sender().toString() + "," + content);
+            JSONObject jsonObject = JSON.parseObject(content);
 
-        log.info("receive->UDP:{}", packet.sender().toString() + "," + content);
+            String action = jsonObject.getString("action");
 
-        JSONObject jsonObject = JSON.parseObject(content);
+            resp.setMsg("鑾峰彇鏈嶅姟绔湴鍧€鎴愬姛锛�");
+            if (!ObjectUtils.isEmpty(action) && "findserver".equals(action)) {
+                String URL = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11021");
+                resp.setData(URL);
+            } else {
+                resp.setCode(YesNoEnum.NO.getValue());
+                resp.setMsg("璇锋眰鍙傛暟寮傚父锛�");
+            }
 
-        String action = jsonObject.getString("action");
-        ApiResp<String> resp = new ApiResp<>();
-        resp.setCode(YesNoEnum.YES.getValue());
-        resp.setMsg("鑾峰彇鏈嶅姟绔湴鍧€鎴愬姛锛�");
-        if (!ObjectUtils.isEmpty(action) && "findserver".equals(action)) {
-            String URL = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11021");
-            resp.setData(URL);
-        } else {
+            InetSocketAddress remoteAddress = new InetSocketAddress(packet.sender().getHostName(), CLIENT_PORT);
+            String sa = EncryptUtil.myReEnscrt(JSON.toJSONString(resp), 9, "FZV1D&tr", ENCRYPT_STR);
+
+            DatagramPacket sendpacket = new DatagramPacket(Unpooled.copiedBuffer(sa, CharsetUtil.UTF_8), remoteAddress);
+            //ctx.writeAndFlush(new DatagramPacket(Unpooled.copiedBuffer(JSON.toJSONString(resp), CharsetUtil.UTF_8), packet.sender()));
+            ctx.writeAndFlush(sendpacket);
+        } catch (Exception e) {
+            log.error("寮傚父", e);
             resp.setCode(YesNoEnum.NO.getValue());
-            resp.setMsg("璇锋眰鍙傛暟寮傚父锛�");
+            resp.setMsg("鍔犲瘑瑙e瘑寮傚父锛�");
         }
-
-        InetSocketAddress remoteAddress = new InetSocketAddress(packet.sender().getHostName(), CLIENT_PORT);
-        DatagramPacket sendpacket = new DatagramPacket(Unpooled.copiedBuffer(EncryptUtil.encrypt(JSON.toJSONString(resp), ENCRYPT_STR), CharsetUtil.UTF_8), remoteAddress);
-        //ctx.writeAndFlush(new DatagramPacket(Unpooled.copiedBuffer(JSON.toJSONString(resp), CharsetUtil.UTF_8), packet.sender()));
-        ctx.writeAndFlush(sendpacket);
-
     }
 
     @Override
-- 
2.24.3