From 8e6aa832606dd0e341e280dd210a51b45fb99bf6 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期日, 29 一月 2023 16:29:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/stwcs' into stwcs
---
version/BarcodeThread1.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/version/BarcodeThread1.java b/version/BarcodeThread1.java
index 38ce936..32bb5bd 100644
--- a/version/BarcodeThread1.java
+++ b/version/BarcodeThread1.java
@@ -47,7 +47,7 @@
String s = new String(read);
if (!Cools.isEmpty(s)) {
barcode = new String(read);
- log.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
+ News.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
JSONObject jsonObject = new JSONObject();
jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
jsonObject.put("barcode", barcode);
@@ -75,10 +75,10 @@
socket.connect(socketAddress, 1000); //鏌愪簺鏈嶅姟鍣╬ing寤惰繜楂樻椂瑕佸鍔�,鍚﹀垯浼氭姤閿檆onnect timeout
dataOutputStream = new DataOutputStream(socket.getOutputStream());
dataInputStream = new DataInputStream(socket.getInputStream());
-// log.info("鏉＄爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// News.info("鏉＄爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} catch (Exception e) {
socket = null;
- log.error("鏉＄爜鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("鏉＄爜鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
}
return true;
@@ -101,7 +101,7 @@
}
socket = null;
} catch (IOException e) {
- log.error("SocketClient close Exception:" + e.getMessage());
+ News.error("SocketClient close Exception:" + e.getMessage());
}
}
--
Gitblit v1.9.1