格式并加些打印

license/src/test/java/iot/sixiang/license/controller/DeviceControllerTest.java

@@ -6,7 +6,6 @@ import iot.sixiang.license.util.HmacUtil;
 import iot.sixiang.license.util.sm4.SM4;
 import iot.sixiang.license.util.sm4.SM4Context;
 import lombok.SneakyThrows;
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
@@ -54,14 +53,14 @@ public class DeviceControllerTest {
         InputStream inputStream = socket.getInputStream();
 
         // 鉴权
-        sendAndReceive(socket, outputStream, inputStream, "auth", authSendBytes, true);
+        sendAndReceive(socket, outputStream, inputStream, "auth", authSendBytes);
 
-        Thread.sleep(100);
+        Thread.sleep(500);
 
         // 鉴权后做动作
         String request = "55AA340090000156F43D4D806827D1BB8F78C00D2B5488479CEB172C5D477C4D3023CE7B111621D4AD2C11ACAC4D876A3AC66A82F5F19000EF";
         byte[] actionSendBytes = hex2Byte(request);
-        byte[] actionResultBytes = sendAndReceive(socket, outputStream, inputStream, "action", actionSendBytes, false);
+        byte[] actionResultBytes = sendAndReceive(socket, outputStream, inputStream, "action", actionSendBytes);
         //String result = "55AA1500A40035414E7DB5B3EDE72BC6BA44203F52EA0000005B";
         //String result = "55aa1500a4008926834e684c4c6911b02304b3a0ce9c00000000";
         //Assert.assertEquals(bytes2Hex(actionResultBytes), result);
@@ -72,17 +71,15 @@ public class DeviceControllerTest {
     }
 
     @SneakyThrows
-    private byte[] sendAndReceive(Socket socket, OutputStream outputStream, InputStream inputStream, String tag, byte[] requestBytes, boolean isAuth) {
+    private byte[] sendAndReceive(Socket socket, OutputStream outputStream, InputStream inputStream, String tag, byte[] requestBytes) {
         System.out.println(tag + " send：" + bytes2Hex(requestBytes));
         outputStream.write(requestBytes);
         outputStream.flush();
         byte[] bytes = new byte[1024];
         int count = inputStream.read(bytes);
-        if (!isAuth) {
-            Thread.sleep(500);
-            while (count < 0) {
-                count = inputStream.read(bytes);
-            }
+        while (count < 0) {
+            Thread.sleep(200);
+            count = inputStream.read(bytes);
         }
         byte[] resultBytes = new byte[count];
         for (int i = 0; i < count; i++) {