From a0a1b5499e458c7b0a2a091608718df9aef448c7 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 10 八月 2023 10:20:44 +0800
Subject: [PATCH] 优化日志
---
src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java | 6 +-
src/main/java/com/ard/alarm/apponekey/service/impl/ArdAlarmApponekeyServiceImpl.java | 2
src/main/java/com/ard/utils/tcp/ClientHandler.java | 2
src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java | 4 +-
src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java | 12 +++---
src/main/java/com/ard/utils/mqtt/MqttConsumerCallback.java | 8 ++--
src/main/resources/logback-spring.xml | 19 +++++++++
src/main/java/com/ard/utils/mqtt/MqttConsumer.java | 16 ++++----
src/main/java/com/ard/utils/tcp/ClientInitialize.java | 8 ++--
src/main/java/com/ard/utils/udp/NettyUdpServer.java | 4 +-
src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java | 18 ++++----
src/main/java/com/ard/config/MinioClientSingleton.java | 2
12 files changed, 59 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/ard/alarm/apponekey/service/impl/ArdAlarmApponekeyServiceImpl.java b/src/main/java/com/ard/alarm/apponekey/service/impl/ArdAlarmApponekeyServiceImpl.java
index 213eb9f..c958173 100644
--- a/src/main/java/com/ard/alarm/apponekey/service/impl/ArdAlarmApponekeyServiceImpl.java
+++ b/src/main/java/com/ard/alarm/apponekey/service/impl/ArdAlarmApponekeyServiceImpl.java
@@ -71,7 +71,7 @@
}
private void printLog(ArdAlarmApponekey ardAlarmApponekey) {
- log.info("鏀跺埌鏁版嵁:" + "銆怚D銆�" + ardAlarmApponekey.getId() + "銆恥serId銆�" + ardAlarmApponekey.getUserId()
+ log.debug("鏀跺埌鏁版嵁:" + "銆怚D銆�" + ardAlarmApponekey.getId() + "銆恥serId銆�" + ardAlarmApponekey.getUserId()
+ "銆愮粡搴︺��" + ardAlarmApponekey.getLongitude() + "銆愮含搴︺��" + ardAlarmApponekey.getLatitude()
+ "銆愰珮灞傘��" + ardAlarmApponekey.getAltitude() + "銆愬垱寤烘椂闂淬��" + ardAlarmApponekey.getCreateTime());
}
diff --git a/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java b/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
index f524b99..06584e6 100644
--- a/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
+++ b/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
@@ -40,7 +40,7 @@
return;
}
nettyUdpServer.init(udpPort);
- log.info("绠＄嚎娉勯湶UDP鏈嶅姟宸插惎鍔�");
+ log.debug("绠＄嚎娉勯湶UDP鏈嶅姟宸插惎鍔�");
}
@@ -65,14 +65,14 @@
map.put("alarmType", start);
map.put("position", position);
map.put("watcher", watcher);
- log.info("寮�濮嬭В鏋�" + start);
- log.info("涓绘満锛�" + host);
- log.info("绠＄嚎缂栧彿锛�" + tubeId);
- log.info("鎶ヨ鏃堕棿锛�" + alarmTime);
- log.info("鎶ヨ绫诲瀷锛�" + type);
- log.info("浣嶇疆锛�" + position);
- log.info("鍊肩彮浜猴細" + watcher);
- log.info("缁撴潫瑙ｆ瀽" + stop);
+ log.debug("寮�濮嬭В鏋�" + start);
+ log.debug("涓绘満锛�" + host);
+ log.debug("绠＄嚎缂栧彿锛�" + tubeId);
+ log.debug("鎶ヨ鏃堕棿锛�" + alarmTime);
+ log.debug("鎶ヨ绫诲瀷锛�" + type);
+ log.debug("浣嶇疆锛�" + position);
+ log.debug("鍊肩彮浜猴細" + watcher);
+ log.debug("缁撴潫瑙ｆ瀽" + stop);
MqttConsumer.publish(2, false, "tube", JSON.toJSONString(map));
} else {
log.error("鏁版嵁寮傚父");
diff --git a/src/main/java/com/ard/config/MinioClientSingleton.java b/src/main/java/com/ard/config/MinioClientSingleton.java
index a4bc199..3cdbd35 100644
--- a/src/main/java/com/ard/config/MinioClientSingleton.java
+++ b/src/main/java/com/ard/config/MinioClientSingleton.java
@@ -30,7 +30,7 @@
domainUrl = SpringTool.getYmlInfo("minio.endpoint");
accessKey = SpringTool.getYmlInfo("minio.accessKey");
secretKey = SpringTool.getYmlInfo("minio.secretKey");
- log.info("minio淇℃伅锛�" + domainUrl + "(" + accessKey + "/" + secretKey + ")");
+ log.debug("minio淇℃伅锛�" + domainUrl + "(" + accessKey + "/" + secretKey + ")");
}
/**
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
index b7f1376..b041298 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/FMSGCallBack.java
@@ -129,7 +129,7 @@
//endregion
break;
default:
- log.info("鏈煡琛屼负浜嬩欢绫诲瀷:" + strVcaAlarm.struRuleInfo.wEventTypeEx);
+ log.debug("鏈煡琛屼负浜嬩欢绫诲瀷:" + strVcaAlarm.struRuleInfo.wEventTypeEx);
printLog(info);
break;
}
@@ -140,13 +140,13 @@
publishMqtt(info);
break;
case HCNetSDK.COMM_UPLOAD_FACESNAP_RESULT:
- log.info("浜鸿劯妫�娴嬩簨浠朵笂鎶�");
+ log.debug("浜鸿劯妫�娴嬩簨浠朵笂鎶�");
break;
case HCNetSDK.COMM_GISINFO_UPLOAD:
- log.info("GPS鎶ヨ淇℃伅涓婃姤");
+ log.debug("GPS鎶ヨ淇℃伅涓婃姤");
break;
case HCNetSDK.COMM_ALARMHOST_CID_ALARM:
- log.info("鎶ヨ涓绘満 CID 鎶ュ憡鎶ヨ涓婁紶");
+ log.debug("鎶ヨ涓绘満 CID 鎶ュ憡鎶ヨ涓婁紶");
//region 鎶ヨ涓绘満鎶ヨ澶勭悊
ArdEquipExternal ardEquipExternal = new ArdEquipExternal();
ardEquipExternal.setIp(sDeviceIP);
@@ -419,7 +419,7 @@
* 鎵撳嵃鎶ヨ涓绘満浜嬩欢鏃ュ織
*/
private void printLog(ExternalAlarmEventInfo info) {
- log.info("銆愭姤璀D銆�" + info.getAlarmId() + "銆愭姤璀﹀悕绉般��" + info.getAlarmName() +
+ log.debug("銆愭姤璀D銆�" + info.getAlarmId() + "銆愭姤璀﹀悕绉般��" + info.getAlarmName() +
"銆愰槻鍖篒D銆�" + info.getDefenseId() + "銆愰槻鍖哄悕绉般��" + info.getDefenseName() + "銆愮被鍨嬨��" + info.getAlarmType() +
"銆愭椂闂淬��" + info.getAlarmTime() + "銆愭姤璀︿富鏈篒D銆�" + info.getAlarmHostId());
}
@@ -428,7 +428,7 @@
* 鎵撳嵃闂ㄧ浜嬩欢鏃ュ織
*/
private void printLog(AccessControlHostEventInfo info) {
- log.info("銆愭姤璀D銆�" + info.getSerialNo() + "銆愯澶囩紪鍙枫��"+
+ log.debug("銆愭姤璀D銆�" + info.getSerialNo() + "銆愯澶囩紪鍙枫��"+
"銆愰棬缂栧彿銆�" + info.getDoorNo() + "銆愪簨浠剁被鍨嬨��" + info.getAlarmType() +
"銆愰槻鍖虹被鍨嬨��" + info.getDefenseType()+"銆愭椂闂淬��" + info.getAlarmTime() +
"銆愰棬绂佷富鏈篒D銆�" + info.getAcsId());
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java b/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
index 2e6faf9..523fd76 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
@@ -297,7 +297,7 @@
public static int setupAlarmChan(String deviceIpPort, int lUserID, int lAlarmHandle) {
// 鏍规嵁璁惧娉ㄥ唽鐢熸垚鐨刲UserID寤虹珛甯冮槻鐨勪笂浼犻�氶亾锛屽嵆鏁版嵁鐨勪笂浼犻�氶亾
if (lUserID == -1) {
- log.info("璇峰厛娉ㄥ唽");
+ log.error("璇峰厛娉ㄥ唽");
return lUserID;
}
if (lAlarmHandle < 0) {
@@ -305,7 +305,7 @@
if (fMSFCallBack_V31 == null) {
fMSFCallBack_V31 = new FMSGCallBack();
if (!hCNetSDK.NET_DVR_SetDVRMessageCallBack_V50(0, fMSFCallBack_V31, null)) {
- log.info("璁剧疆鍥炶皟鍑芥暟澶辫触!閿欒鐮�==========銆�" + hCNetSDK.NET_DVR_GetLastError());
+ log.error("璁剧疆鍥炶皟鍑芥暟澶辫触!閿欒鐮�==========銆�" + hCNetSDK.NET_DVR_GetLastError());
}
}
// 杩欓噷闇�瑕佸璁惧杩涜鐩稿簲鐨勫弬鏁拌缃紝涓嶈缃垨璁剧疆閿欒閮戒細瀵艰嚧璁惧娉ㄥ唽澶辫触
@@ -326,7 +326,7 @@
logout(lUserID);
return lAlarmHandle;
} else {
- log.info("璁惧銆�" + deviceIpPort + "銆戝竷闃叉垚鍔�");
+ log.debug("璁惧銆�" + deviceIpPort + "銆戝竷闃叉垚鍔�");
return lAlarmHandle;
}
}
diff --git a/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java b/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
index 5f8b731..49d6575 100644
--- a/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
+++ b/src/main/java/com/ard/utils/hiksdk/service/impl/LoginResultCallBack.java
@@ -29,11 +29,11 @@
String deviceIpPort = deviceInfo.getIp() + ":" + deviceInfo.getPort();
if (dwResult == 1) {
GlobalVariable.loginMap.put(deviceInfo.getDeviceId(), lUserID);
- log.info("璁惧銆�" + deviceIpPort + "銆戠櫥褰曟垚鍔�");
+ log.debug("璁惧銆�" + deviceIpPort + "銆戠櫥褰曟垚鍔�");
// 璁剧疆鎶ヨ鍥炶皟鍑芥暟锛屽缓绔嬫姤璀︿笂浼犻�氶亾锛堝惎鐢ㄥ竷闃诧級
HikClientUtil.setupAlarmChan(deviceIpPort, lUserID, -1);
} else {
- log.info("璁惧銆�" + deviceIpPort + "銆戠櫥褰曞け璐�");
+ log.debug("璁惧銆�" + deviceIpPort + "銆戠櫥褰曞け璐�");
}
return 1;
}
diff --git a/src/main/java/com/ard/utils/mqtt/MqttConsumer.java b/src/main/java/com/ard/utils/mqtt/MqttConsumer.java
index 55af6ec..6c80d29 100644
--- a/src/main/java/com/ard/utils/mqtt/MqttConsumer.java
+++ b/src/main/java/com/ard/utils/mqtt/MqttConsumer.java
@@ -28,7 +28,7 @@
@Override
public void run(ApplicationArguments args) {
- log.info("鍒濆鍖栧苟鍚姩mqtt......");
+ log.debug("鍒濆鍖栧苟鍚姩mqtt......");
if (PropertiesUtil.MQTT_ENABLED) {
this.connect();
}
@@ -61,7 +61,7 @@
if (null == client) {
client = new MqttClient(PropertiesUtil.MQTT_HOST, PropertiesUtil.MQTT_CLIENT_ID, new MemoryPersistence());
}
- log.info("--鍒涘缓mqtt瀹㈡埛绔�");
+ log.debug("--鍒涘缓mqtt瀹㈡埛绔�");
} catch (Exception e) {
log.error("鍒涘缓mqtt瀹㈡埛绔紓甯革細" + e);
}
@@ -81,7 +81,7 @@
options.setKeepAliveInterval(PropertiesUtil.MQTT_KEEP_ALIVE);
// 鏄惁娓呴櫎session
options.setCleanSession(true);
- log.info("--鐢熸垚mqtt閰嶇疆瀵硅薄");
+ log.debug("--鐢熸垚mqtt閰嶇疆瀵硅薄");
return options;
}
@@ -101,7 +101,7 @@
*/
qos[i] = 1;
}
- log.info("--璁剧疆娑堟伅鍙戝竷璐ㄩ噺");
+ log.debug("--璁剧疆娑堟伅鍙戝竷璐ㄩ噺");
return qos;
}
@@ -111,7 +111,7 @@
public void create(MqttConnectOptions options, String[] topic, int[] qos) {
try {
client.setCallback(new MqttConsumerCallback(client, options, topic, qos));
- log.info("--娣诲姞鍥炶皟澶勭悊绫�");
+ log.debug("--娣诲姞鍥炶皟澶勭悊绫�");
client.connect(options);
} catch (Exception e) {
log.info("瑁呰浇瀹炰緥鎴栬闃呬富棰樺紓甯革細" + e);
@@ -126,7 +126,7 @@
*/
public void subscribe(String topic, int qos) {
try {
- log.info("topic:" + topic);
+ log.debug("topic:" + topic);
client.subscribe(topic, qos);
} catch (MqttException e) {
e.printStackTrace();
@@ -150,7 +150,7 @@
*/
public static void publish(int qos, boolean retained, String topic, String pushMessage) {
if (client != null) {
- log.info("銆愪富棰樸��:" + topic + "銆恞os銆�:" + qos + "銆恜ushMessage銆�:" + pushMessage);
+ log.debug("銆愪富棰樸��:" + topic + "銆恞os銆�:" + qos + "銆恜ushMessage銆�:" + pushMessage);
MqttMessage message = new MqttMessage();
message.setQos(qos);
message.setRetained(retained);
@@ -168,7 +168,7 @@
token = mTopic.publish(message);
token.waitForCompletion();
if (token.isComplete()) {
- log.info("娑堟伅鍙戦�佹垚鍔�");
+ log.debug("娑堟伅鍙戦�佹垚鍔�");
}
} catch (MqttPersistenceException e) {
log.error("mqtt鎸佷箙寮傚父锛�" + e.getMessage());
diff --git a/src/main/java/com/ard/utils/mqtt/MqttConsumerCallback.java b/src/main/java/com/ard/utils/mqtt/MqttConsumerCallback.java
index 8cb5988..20e9f7c 100644
--- a/src/main/java/com/ard/utils/mqtt/MqttConsumerCallback.java
+++ b/src/main/java/com/ard/utils/mqtt/MqttConsumerCallback.java
@@ -81,14 +81,14 @@
if (null != topic && null != qos) {
if (client.isConnected()) {
client.subscribe(topic, qos);
- log.info("mqtt杩炴帴鎴愬姛锛屽鎴风ID锛�" + PropertiesUtil.MQTT_CLIENT_ID);
- log.info("--璁㈤槄涓婚:锛�" + Arrays.toString(topic));
+ log.debug("mqtt杩炴帴鎴愬姛锛屽鎴风ID锛�" + PropertiesUtil.MQTT_CLIENT_ID);
+ log.debug("--璁㈤槄涓婚:锛�" + Arrays.toString(topic));
} else {
- log.info("mqtt杩炴帴澶辫触锛屽鎴风ID锛�" + PropertiesUtil.MQTT_CLIENT_ID);
+ log.debug("mqtt杩炴帴澶辫触锛屽鎴风ID锛�" + PropertiesUtil.MQTT_CLIENT_ID);
}
}
} catch (Exception e) {
- log.info("mqtt璁㈤槄涓婚寮傚父:" + e);
+ log.error("mqtt璁㈤槄涓婚寮傚父:" + e);
}
}
}
diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java
index dc27a7c..74f4d99 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -143,7 +143,7 @@
byte[] heart = ByteUtils.appendArrays(header, payload, payloadCrc32, footer);
// byte[] heart = {0x01, 0x02, 0x01, 0x10, 0x00, 0x00, 0x00, (byte) 0x83, (byte) 0x88, 0x5d, 0x71, 0x01, 0x02, 0x00};
String hexString = DatatypeConverter.printHexBinary(heart);
- log.info("鍙戦�佸績璺�:" + hexString);
+ log.debug("鍙戦�佸績璺�:" + hexString);
message.writeBytes(heart);
context.writeAndFlush(message);
diff --git a/src/main/java/com/ard/utils/tcp/ClientInitialize.java b/src/main/java/com/ard/utils/tcp/ClientInitialize.java
index 674d095..384e007 100644
--- a/src/main/java/com/ard/utils/tcp/ClientInitialize.java
+++ b/src/main/java/com/ard/utils/tcp/ClientInitialize.java
@@ -82,7 +82,7 @@
}
});
}
- Thread.sleep(3000);
+ Thread.sleep(10000);
} catch (Exception e) {
log.error("Netty鍒濆鍖栭厤缃洃鍚湴鍧�鍑虹幇寮傚父");
e.printStackTrace();
@@ -104,14 +104,14 @@
// 寮傛杩炴帴tcp鏈嶅姟绔�
bootstrap.remoteAddress(host, port).connect().addListener((ChannelFuture futureListener) -> {
if (!futureListener.isSuccess()) {
- log.error(host + ":" + port + "闆疯揪TCP鏈嶅姟绔繛鎺ュけ璐�");
+ log.error("闆疯揪銆�" + host + ":" + port + "銆戣繛鎺ュけ璐�");
futureListener.channel().close();
// 杩炴帴澶辫触淇℃伅鎻掑叆Set
falseConnectSet.add(ardEquipRadar);
// 杩炴帴澶辫触淇℃伅浠巑ap绉婚櫎
tureConnectMap.remove(futureListener.channel().id());
} else {
- log.info(host + ":" + port + "闆疯揪TCP鏈嶅姟绔繛鎺ユ垚鍔�");
+ log.info("闆疯揪銆�" + host + ":" + port + "銆戣繛鎺ユ垚鍔�");
// 杩炴帴鎴愬姛淇℃伅浠嶴et鎷旈櫎
falseConnectSet.remove(ardEquipRadar);
// 杩炴帴鎴愬姛淇℃伅鍐欏叆map
@@ -133,7 +133,7 @@
for (ArdEquipRadar ardEquipRadar : ardEquipRadars) {
String host = ardEquipRadar.getIp();
Integer port = Integer.valueOf(ardEquipRadar.getPort());
- log.info("TCP瀹㈡埛绔皾璇曡繛鎺ワ細" + host + ":" + port);
+ log.debug("TCP瀹㈡埛绔皾璇曡繛鎺ワ細" + host + ":" + port);
connectServer(ardEquipRadar);//杩炴帴姣忎竴涓浄杈炬湇鍔�
}
}
diff --git a/src/main/java/com/ard/utils/udp/NettyUdpServer.java b/src/main/java/com/ard/utils/udp/NettyUdpServer.java
index caa5a8e..0891737 100644
--- a/src/main/java/com/ard/utils/udp/NettyUdpServer.java
+++ b/src/main/java/com/ard/utils/udp/NettyUdpServer.java
@@ -35,13 +35,13 @@
serverBootstrap = serverBootstrap.handler(new NettyUdpHandler());
//6銆佺粦瀹歴erver锛岄�氳繃璋冪敤sync锛堬級鏂规硶寮傛闃诲锛岀洿鍒扮粦瀹氭垚鍔�
ChannelFuture channelFuture = serverBootstrap.bind(port).sync();
- log.info("started and listened on " + channelFuture.channel().localAddress());
+ log.debug("started and listened on " + channelFuture.channel().localAddress());
//7銆佺洃鍚�氶亾鍏抽棴浜嬩欢锛屽簲鐢ㄧ▼搴忎細涓�鐩寸瓑寰咃紝鐩村埌channel鍏抽棴
channelFuture.channel().closeFuture().sync();
} catch (Exception e) {
log.error("error:" + e.getMessage());
} finally {
- log.info("netty udp close!");
+ log.debug("netty udp close!");
//8 鍏抽棴EventLoopGroup锛�
bossLoopGroup.shutdownGracefully();
}
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 02e95f2..2264a59 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!--鏃ュ織瀛樻斁璺緞-->
- <property name="log.path" value="./logs"/>
+ <property name="log.path" value="./alarmLogs"/>
<!--鏃ュ織杈撳嚭鏍煎紡-->
<property name="log.pattern" value="%d{HH:mm:ss.SSS}[%thread]%-5level%logger{20}-[%method,%line]-%msg%n"/>
<!--鎺у埗鍙拌緭鍑�-->
@@ -120,6 +120,19 @@
<onMismatch>DENY</onMismatch>
</filter>
</appender>
+ <!--hikSdk鏃ュ織杈撳嚭-->
+ <appender name="hikSdk" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/hikSdk.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!--鎸夊ぉ鍥炴粴daily-->
+ <fileNamePattern>${log.path}/hikSdk.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!--鏃ュ織鏈�澶х殑鍘嗗彶60澶�-->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
<root level="DEBUG">
<appender-ref ref="console"/>
</root>
@@ -143,5 +156,9 @@
<logger name="mqtt" level="INFO">
<appender-ref ref="mqtt"/>
</logger>
+ <!--hiksdk鏃ュ織鎵撳嵃绛夌骇-->
+ <logger name="hikSdk" level="debug">
+ <appender-ref ref="hikSdk"/>
+ </logger>
</configuration>
--
Gitblit v1.9.3