Merge branch 'master' of http://47.100.114.196:3001/jwy/aeon_tcp into zhc

src/main/java/com/aeon/tcp/csdj/CsdjServer.java

@@ -110,28 +110,28 @@ public class CsdjServer {
                 String terminalId = frame.getTerminalId();
                 byte[] data = frame.getInfoPart();
 
-                log.info("========================================");
-                log.info("Received device notification data");
-                log.info("----------------------------------------");
-                log.info("Terminal ID: {}", terminalId);
+                log.info("[CSDJ] ========================================");
+                log.info("[CSDJ] Received device notification data");
+                log.info("[CSDJ] ----------------------------------------");
+                log.info("[CSDJ] Terminal ID: {}", terminalId);
 
                 if (data != null && data.length > 0) {
 
                     String hexData = bytesToHex(data);
-                    log.info("Data length: {} bytes", data.length);
-                    log.info("Received Hex: {}", hexData);
-                    log.info("Decimal array: {}", Arrays.toString(data));
+                    log.info("[CSDJ] Data length: {} bytes", data.length);
+                    log.info("[CSDJ] Received Hex: {}", hexData);
+                    log.info("[CSDJ] Decimal array: {}", Arrays.toString(data));
 
                     httpExecutor.submit(() -> {
                         try {
                             //要用异步，不然会和这个csdj数据接收冲突阻塞
                             sendDataAsync(terminalId, hexData);
                         } catch (Exception e) {
-                            log.error("Failed to send data asynchronously", e);
+                            log.error("[CSDJ] Failed to send data asynchronously", e);
                         }
                     });
                 } else {
-                    log.info("Data: empty");
+                    log.info("[CSDJ] Data: empty");
                 }
 
                 log.info("========================================");
@@ -149,9 +149,9 @@ public class CsdjServer {
         String jsonParams = gson.toJson(csdjEntity);
         MyHTTPResponse response = defaultHttpRequestUtil.postJson(dataCenterEnvConfig.getCsdjApiUrl(), jsonParams);
         if (response.getCode() == 200) {
-            log.info("csdj data sent successfully....");
+            log.info("[CSDJ] csdj data sent successfully....");
         } else {
-            log.error("csdj data sent failed....");
+            log.error("[CSDJ] csdj data sent failed....");
         }
     }
 

src/main/java/com/aeon/tcp/csdj/session/CsdjSession.java

@@ -255,7 +255,7 @@ public class CsdjSession implements AutoCloseable {
             sendPendingFrame();
         } else if (isServer) {
             // 服务器端，没有数据要发，直接断开
-            log.info("No data to send, sending DISC to disconnect.");
+            log.info("[CSDJ] No data to send, sending DISC to disconnect.");
             sendFrame(CsdjFrame.createSimpleFrame(FrameIdentifier.DISCONNECT, terminalId));
             state = SessionState.CLOSING;
         } else {
@@ -321,7 +321,7 @@ public class CsdjSession implements AutoCloseable {
 
     private void handleDiscAck(CsdjFrame frame) {
         state = SessionState.CLOSED;
-        log.info("Received disc ack, disconnected...");
+        log.info("[CSDJ] Received disc ack, disconnected...");
         close();
     }