From f7a2d2a92d7e25780c91dd74ecf52e094b62ef4c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期一, 26 四月 2021 11:37:54 +0800
Subject: [PATCH] 去除所有的system.print, 优化日志显示
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java | 6 +
src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java | 11 ++
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 4
src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java | 11 ++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 4
src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java | 12 +-
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/ByeRequestProcessor.java | 8 +
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 4
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java | 17 ++-
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/OtherRequestProcessor.java | 6 +
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 11 ++
src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java | 6 +
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/SubscribeRequestProcessor.java | 8 +
src/main/java/com/genersoft/iot/vmp/gb28181/utils/NumericUtil.java | 15 ++-
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 4
src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java | 26 +++--
src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java | 10 +
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java | 1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 22 ++--
21 files changed, 124 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
index eba9a5e..e9d158c 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaServerConfig.java
@@ -22,6 +22,9 @@
@JSONField(name = "general.enableVhost")
private String generalEnableVhost;
+ @JSONField(name = "general.mediaServerId")
+ private String generalMediaServerId;
+
@JSONField(name = "general.flowThreshold")
private String generalFlowThreshold;
@@ -738,4 +741,12 @@
public void setUpdateTime(long updateTime) {
this.updateTime = updateTime;
}
+
+ public String getGeneralMediaServerId() {
+ return generalMediaServerId;
+ }
+
+ public void setGeneralMediaServerId(String generalMediaServerId) {
+ this.generalMediaServerId = generalMediaServerId;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
index 4605ede..60100e1 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
@@ -39,6 +39,8 @@
import javax.sip.message.Response;
import gov.nist.core.InternalErrorHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implements the HTTP digest authentication method server side functionality.
@@ -48,6 +50,8 @@
*/
public class DigestServerAuthenticationHelper {
+
+ private Logger logger = LoggerFactory.getLogger(DigestServerAuthenticationHelper.class);
private MessageDigest messageDigest;
@@ -204,18 +208,18 @@
String A2 = request.getMethod().toUpperCase() + ":" + uri.toString();
byte mdbytes[] = messageDigest.digest(A1.getBytes());
String HA1 = toHexString(mdbytes);
- System.out.println("A1: " + A1);
- System.out.println("A2: " + A2);
+ logger.debug("A1: " + A1);
+ logger.debug("A2: " + A2);
mdbytes = messageDigest.digest(A2.getBytes());
String HA2 = toHexString(mdbytes);
- System.out.println("HA1: " + HA1);
- System.out.println("HA2: " + HA2);
+ logger.debug("HA1: " + HA1);
+ logger.debug("HA2: " + HA2);
String cnonce = authHeader.getCNonce();
- System.out.println("nonce: " + nonce);
- System.out.println("nc: " + ncStr);
- System.out.println("cnonce: " + cnonce);
- System.out.println("qop: " + qop);
+ logger.debug("nonce: " + nonce);
+ logger.debug("nc: " + ncStr);
+ logger.debug("cnonce: " + cnonce);
+ logger.debug("qop: " + qop);
String KD = HA1 + ":" + nonce;
if (qop != null && qop.equals("auth") ) {
@@ -228,12 +232,12 @@
KD += ":" + qop;
}
KD += ":" + HA2;
- System.out.println("KD: " + KD);
+ logger.debug("KD: " + KD);
mdbytes = messageDigest.digest(KD.getBytes());
String mdString = toHexString(mdbytes);
- System.out.println("mdString: " + mdString);
+ logger.debug("mdString: " + mdString);
String response = authHeader.getResponse();
- System.out.println("response: " + response);
+ logger.debug("response: " + response);
return mdString.equals(response);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java
index 3b2ceaa..13ed98a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java
@@ -1,5 +1,7 @@
package com.genersoft.iot.vmp.gb28181.event.offline;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.Message;
import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
@@ -16,6 +18,8 @@
*/
@Component
public class KeepaliveTimeoutListenerForPlatform extends KeyExpirationEventMessageListener {
+
+ private Logger logger = LoggerFactory.getLogger(KeepaliveTimeoutListenerForPlatform.class);
@Autowired
private EventPublisher publisher;
@@ -34,9 +38,9 @@
public void onMessage(Message message, byte[] pattern) {
// 鑾峰彇澶辨晥鐨刱ey
String expiredKey = message.toString();
- System.out.println(expiredKey);
+ logger.info(expiredKey);
if(!expiredKey.startsWith(VideoManagerConstants.PLATFORM_PREFIX)){
- System.out.println("鏀跺埌redis杩囨湡鐩戝惉锛屼絾寮�澶翠笉鏄�"+VideoManagerConstants.PLATFORM_PREFIX+"锛屽拷鐣�");
+ logger.info("鏀跺埌redis杩囨湡鐩戝惉锛屼絾寮�澶翠笉鏄�"+VideoManagerConstants.PLATFORM_PREFIX+"锛屽拷鐣�");
return;
}
// 骞冲彴蹇冭烦鍒版湡,闇�瑕侀噸鍙�, 鍒ゆ柇鏄惁宸茬粡澶氭鏈敹鍒板績璺冲洖澶�, 澶氭鏈敹鍒�,鍒欓噸鏂板彂璧锋敞鍐�, 娉ㄥ唽灏濊瘯澶氭鏈緱鍒板洖澶�,鍒欒涓哄钩鍙扮绾�
@@ -45,7 +49,7 @@
publisher.platformKeepaliveExpireEventPublish(platformGBId);
}else if (expiredKey.startsWith(VideoManagerConstants.PLATFORM_REGISTER_PREFIX)) {
- System.out.println("11111111111111");
+ logger.info("11111111111111");
String platformGBId = expiredKey.substring(VideoManagerConstants.PLATFORM_REGISTER_PREFIX.length(),expiredKey.length());
publisher.platformNotRegisterEventPublish(platformGBId);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java
index 4b5e571..27ced6c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepliveTimeoutListener.java
@@ -1,5 +1,7 @@
package com.genersoft.iot.vmp.gb28181.event.offline;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.Message;
import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
@@ -16,6 +18,8 @@
*/
@Component
public class KeepliveTimeoutListener extends KeyExpirationEventMessageListener {
+
+ private Logger logger = LoggerFactory.getLogger(KeepliveTimeoutListener.class);
@Autowired
private EventPublisher publisher;
@@ -34,7 +38,7 @@
// 鑾峰彇澶辨晥鐨刱ey
String expiredKey = message.toString();
if(!expiredKey.startsWith(VideoManagerConstants.KEEPLIVEKEY_PREFIX)){
- System.out.println("鏀跺埌redis杩囨湡鐩戝惉锛屼絾寮�澶翠笉鏄�"+VideoManagerConstants.KEEPLIVEKEY_PREFIX+"锛屽拷鐣�");
+ logger.info("鏀跺埌redis杩囨湡鐩戝惉锛屼絾寮�澶翠笉鏄�"+VideoManagerConstants.KEEPLIVEKEY_PREFIX+"锛屽拷鐣�");
return;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index eb80955..dfc6c16 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -280,7 +280,7 @@
public boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) {
try {
String cmdStr= frontEndCmdString(cmdCode, parameter1, parameter2, combineCode2);
- System.out.println("鎺у埗瀛楃涓诧細" + cmdStr);
+ logger.info("鎺у埗瀛楃涓诧細" + cmdStr);
StringBuffer ptzXml = new StringBuffer(200);
ptzXml.append("<?xml version=\"1.0\" ?>\r\n");
ptzXml.append("<Control>\r\n");
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
index c1e43e8..445f4d2 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/AckRequestProcessor.java
@@ -14,6 +14,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @Description:ACK璇锋眰澶勭悊鍣�
@@ -21,6 +23,9 @@
* @date: 2020骞�5鏈�3鏃� 涓嬪崍5:31:45
*/
public class AckRequestProcessor extends SIPRequestAbstractProcessor {
+
+
+ private Logger logger = LoggerFactory.getLogger(AckRequestProcessor.class);
private IRedisCatchStorage redisCatchStorage;
@@ -55,8 +60,8 @@
}
redisCatchStorage.updateSendRTPSever(sendRtpItem);
- System.out.println(platformGbId);
- System.out.println(channelId);
+ logger.info(platformGbId);
+ logger.info(channelId);
Map<String, Object> param = new HashMap<>();
param.put("vhost","__defaultVhost__");
param.put("app",streamInfo.getApp());
@@ -74,16 +79,16 @@
if (System.currentTimeMillis() - startTime < 30 * 1000) {
if (zlmrtpServerFactory.isStreamReady(streamInfo.getApp(), streamInfo.getStreamId())) {
rtpPushed = true;
- System.out.println("宸茶幏鍙栬澶囨帹娴侊紝寮�濮嬪悜涓婄骇鎺ㄦ祦");
+ logger.info("宸茶幏鍙栬澶囨帹娴侊紝寮�濮嬪悜涓婄骇鎺ㄦ祦");
zlmrtpServerFactory.startSendRtpStream(param);
} else {
- System.out.println("绛夊緟璁惧鎺ㄦ祦.......");
+ logger.info("绛夊緟璁惧鎺ㄦ祦.......");
Thread.sleep(1000);
continue;
}
} else {
rtpPushed = true;
- System.out.println("璁惧鎺ㄦ祦瓒呮椂锛岀粓姝㈠悜涓婄骇鎺ㄦ祦");
+ logger.info("璁惧鎺ㄦ祦瓒呮椂锛岀粓姝㈠悜涓婄骇鎺ㄦ祦");
}
} catch (InterruptedException e) {
e.printStackTrace();
@@ -95,7 +100,7 @@
// CSeq csReq = (CSeq) request.getHeader(CSeq.NAME);
// ackRequest = dialog.createAck(csReq.getSeqNumber());
// dialog.sendAck(ackRequest);
- // System.out.println("send ack to callee:" + ackRequest.toString());
+ // logger.info("send ack to callee:" + ackRequest.toString());
// } catch (SipException e) {
// e.printStackTrace();
// } catch (InvalidArgumentException e) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/ByeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/ByeRequestProcessor.java
index 5fe10b6..17104ba 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/ByeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/ByeRequestProcessor.java
@@ -16,6 +16,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.text.ParseException;
import java.util.HashMap;
@@ -27,6 +29,8 @@
* @date: 2021骞�3鏈�9鏃�
*/
public class ByeRequestProcessor extends SIPRequestAbstractProcessor {
+
+ private Logger logger = LoggerFactory.getLogger(ByeRequestProcessor.class);
private ISIPCommander cmder;
@@ -54,11 +58,11 @@
param.put("vhost","__defaultVhost__");
param.put("app",sendRtpItem.getApp());
param.put("stream",streamId);
- System.out.println("鍋滄鍚戜笂绾ф帹娴侊細" + streamId);
+ logger.info("鍋滄鍚戜笂绾ф帹娴侊細" + streamId);
zlmrtpServerFactory.stopSendRtpStream(param);
redisCatchStorage.deleteSendRTPServer(platformGbId, channelId);
if (zlmrtpServerFactory.totalReaderCount(sendRtpItem.getApp(), streamId) == 0) {
- System.out.println(streamId + "鏃犲叾瀹冭鐪嬭�咃紝閫氱煡璁惧鍋滄鎺ㄦ祦");
+ logger.info(streamId + "鏃犲叾瀹冭鐪嬭�咃紝閫氱煡璁惧鍋滄鎺ㄦ祦");
cmder.streamByeCmd(sendRtpItem.getDeviceId(), channelId);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
index 6306a98..a21ce59 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -114,13 +114,13 @@
String cmd = XmlUtil.getText(rootElement, "CmdType");
if (MESSAGE_KEEP_ALIVE.equals(cmd)) {
- logger.info("鎺ユ敹鍒癒eepAlive娑堟伅");
+ logger.debug("鎺ユ敹鍒癒eepAlive娑堟伅");
processMessageKeepAlive(evt);
} else if (MESSAGE_CONFIG_DOWNLOAD.equals(cmd)) {
- logger.info("鎺ユ敹鍒癈onfigDownload娑堟伅");
+ logger.debug("鎺ユ敹鍒癈onfigDownload娑堟伅");
processMessageConfigDownload(evt);
} else if (MESSAGE_CATALOG.equals(cmd)) {
- logger.info("鎺ユ敹鍒癈atalog娑堟伅");
+ logger.debug("鎺ユ敹鍒癈atalog娑堟伅");
processMessageCatalogList(evt);
} else if (MESSAGE_DEVICE_INFO.equals(cmd)) {
// DeviceInfo娑堟伅澶勭悊
@@ -129,31 +129,31 @@
// DeviceStatus娑堟伅澶勭悊
processMessageDeviceStatus(evt);
} else if (MESSAGE_DEVICE_CONTROL.equals(cmd)) {
- logger.info("鎺ユ敹鍒癉eviceControl娑堟伅");
+ logger.debug("鎺ユ敹鍒癉eviceControl娑堟伅");
processMessageDeviceControl(evt);
} else if (MESSAGE_DEVICE_CONFIG.equals(cmd)) {
logger.info("鎺ユ敹鍒癉eviceConfig娑堟伅");
processMessageDeviceConfig(evt);
} else if (MESSAGE_ALARM.equals(cmd)) {
- logger.info("鎺ユ敹鍒癆larm娑堟伅");
+ logger.debug("鎺ユ敹鍒癆larm娑堟伅");
processMessageAlarm(evt);
} else if (MESSAGE_RECORD_INFO.equals(cmd)) {
- logger.info("鎺ユ敹鍒癛ecordInfo娑堟伅");
+ logger.debug("鎺ユ敹鍒癛ecordInfo娑堟伅");
processMessageRecordInfo(evt);
}else if (MESSAGE_MEDIA_STATUS.equals(cmd)) {
- logger.info("鎺ユ敹鍒癕ediaStatus娑堟伅");
+ logger.debug("鎺ユ敹鍒癕ediaStatus娑堟伅");
processMessageMediaStatus(evt);
} else if (MESSAGE_MOBILE_POSITION.equals(cmd)) {
- logger.info("鎺ユ敹鍒癕obilePosition娑堟伅");
+ logger.debug("鎺ユ敹鍒癕obilePosition娑堟伅");
processMessageMobilePosition(evt);
} else if (MESSAGE_PRESET_QUERY.equals(cmd)) {
- logger.info("鎺ユ敹鍒癙resetQuery娑堟伅");
+ logger.debug("鎺ユ敹鍒癙resetQuery娑堟伅");
processMessagePresetQuery(evt);
} else if (MESSAGE_BROADCAST.equals(cmd)) {
// Broadcast娑堟伅澶勭悊
processMessageBroadcast(evt);
} else {
- logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
+ logger.debug("鎺ユ敹鍒版秷鎭細" + cmd);
responseAck(evt);
}
} catch (DocumentException | SipException |InvalidArgumentException | ParseException e) {
@@ -467,7 +467,7 @@
cmderFroPlatform.deviceInfoResponse(parentPlatform, sn, fromHeader.getTag());
}
} else {
- logger.info("鎺ユ敹鍒癉eviceInfo搴旂瓟娑堟伅");
+ logger.debug("鎺ユ敹鍒癉eviceInfo搴旂瓟娑堟伅");
Device device = storager.queryVideoDevice(deviceId);
if (device == null) {
return;
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/OtherRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/OtherRequestProcessor.java
index 028835b..65ed0c4 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/OtherRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/OtherRequestProcessor.java
@@ -3,6 +3,8 @@
import javax.sip.RequestEvent;
import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @Description:鏆備笉鏀寔鐨勬秷鎭姹傚鐞嗗櫒
@@ -10,6 +12,8 @@
* @date: 2020骞�5鏈�3鏃� 涓嬪崍5:32:59
*/
public class OtherRequestProcessor extends SIPRequestAbstractProcessor {
+
+ private Logger logger = LoggerFactory.getLogger(OtherRequestProcessor.class);
/**
* <p>Title: process</p>
@@ -21,7 +25,7 @@
*/
@Override
public void process(RequestEvent evt) {
- System.out.println("Unsupported the method: " + evt.getRequest().getMethod());
+ logger.info("Unsupported the method: " + evt.getRequest().getMethod());
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/SubscribeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/SubscribeRequestProcessor.java
index 010659e..58a3f17 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/SubscribeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/SubscribeRequestProcessor.java
@@ -11,6 +11,8 @@
import javax.sip.message.Response;
import com.genersoft.iot.vmp.gb28181.transmit.request.SIPRequestAbstractProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @Description:SUBSCRIBE璇锋眰澶勭悊鍣�
@@ -18,6 +20,8 @@
* @date: 2020骞�5鏈�3鏃� 涓嬪崍5:31:20
*/
public class SubscribeRequestProcessor extends SIPRequestAbstractProcessor {
+
+ private Logger logger = LoggerFactory.getLogger(SubscribeRequestProcessor.class);
/**
* 澶勭悊SUBSCRIBE璇锋眰
@@ -38,13 +42,13 @@
ExpiresHeader expireHeader = getHeaderFactory().createExpiresHeader(30);
response.setExpires(expireHeader);
}
- System.out.println("response : " + response.toString());
+ logger.info("response : " + response.toString());
ServerTransaction transaction = getServerTransaction(evt);
if (transaction != null) {
transaction.sendResponse(response);
transaction.terminate();
} else {
- System.out.println("processRequest serverTransactionId is null.");
+ logger.info("processRequest serverTransactionId is null.");
}
} catch (ParseException e) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
index 0e238b0..7368c36 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
@@ -9,6 +9,8 @@
import javax.sip.message.Response;
import gov.nist.javax.sip.ResponseEventExt;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -24,7 +26,7 @@
@Component
public class InviteResponseProcessor implements ISIPResponseProcessor {
- // private final static Logger logger = LoggerFactory.getLogger(InviteResponseProcessor.class);
+ private final static Logger logger = LoggerFactory.getLogger(InviteResponseProcessor.class);
/**
* 澶勭悊invite鍝嶅簲
@@ -51,7 +53,7 @@
requestURI.setHost(event.getRemoteIpAddress());
requestURI.setPort(event.getRemotePort());
reqAck.setRequestURI(requestURI);
- System.out.println("鍚� " + event.getRemoteIpAddress() + ":" + event.getRemotePort() + "鍥炲ack");
+ logger.info("鍚� " + event.getRemoteIpAddress() + ":" + event.getRemotePort() + "鍥炲ack");
dialog.sendAck(reqAck);
}
} catch (InvalidArgumentException | SipException e) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/NumericUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/NumericUtil.java
index 4a399b8..3db3813 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/NumericUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/NumericUtil.java
@@ -1,11 +1,16 @@
package com.genersoft.iot.vmp.gb28181.utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* 鏁板�兼牸寮忓垽鏂拰澶勭悊
* @author lawrencehj
* @date 2021骞�1鏈�27鏃�
*/
public class NumericUtil {
+
+ private static Logger logger = LoggerFactory.getLogger(NumericUtil.class);
/**
* 鍒ゆ柇鏄惁Double鏍煎紡
@@ -14,11 +19,11 @@
*/
public static boolean isDouble(String str) {
try {
- Double num2 = Double.valueOf(str);
- System.out.println(num2 + " is a valid numeric string!");
+ Double num2 = Double.valueOf(str);
+ logger.debug(num2 + " is a valid numeric string!");
return true;
} catch (Exception e) {
- System.out.println(str + " is an invalid numeric string!");
+ logger.debug(str + " is an invalid numeric string!");
return false;
}
}
@@ -31,10 +36,10 @@
public static boolean isInteger(String str) {
try {
int num2 = Integer.valueOf(str);
- System.out.println(num2 + " is an integer!");
+ logger.debug(num2 + " is an integer!");
return true;
} catch (Exception e) {
- System.out.println(str + " is not an integer!");
+ logger.debug(str + " is not an integer!");
return false;
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 5795690..c9e7a2f 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -251,7 +251,7 @@
JSONArray tracks = json.getJSONArray("tracks");
boolean regist = json.getBoolean("regist");
if (tracks != null) {
- System.out.println("on_stream_changed->>" + schema);
+ logger.info("[stream: " + streamId + "]on_stream_changed->>" + schema);
}
if ("rtmp".equals(schema)){
if ("rtp".equals(app) && !regist ) {
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
index 5583832..3b7428a 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
@@ -71,7 +71,6 @@
jsonObject.put("app", streamPushItem.getApp());
jsonObject.put("stream", streamPushItem.getStream());
subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_play,jsonObject,(response)->{
- System.out.println(1222211111);
updateMedia(response.getString("app"), response.getString("stream"));
});
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index 42ad823..8ff9224 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -131,8 +131,8 @@
}
public JSONObject addFFmpegSource(String src_url, String dst_url, String timeout_ms){
- System.out.println(src_url);
- System.out.println(dst_url);
+ logger.info(src_url);
+ logger.info(dst_url);
Map<String, Object> param = new HashMap<>();
param.put("src_url", src_url);
param.put("dst_url", dst_url);
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
index e76a2d8..97db56c 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -189,7 +189,7 @@
public Boolean startSendRtpStream(Map<String, Object>param) {
Boolean result = false;
JSONObject jsonObject = zlmresTfulUtils.startSendRtp(param);
- System.out.println(jsonObject);
+ logger.info(jsonObject.toJSONString());
if (jsonObject == null) {
logger.error("RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
} else if (jsonObject.getInteger("code") == 0) {
@@ -233,7 +233,7 @@
public Boolean stopSendRtpStream(Map<String, Object>param) {
Boolean result = false;
JSONObject jsonObject = zlmresTfulUtils.stopSendRtp(param);
- System.out.println(jsonObject);
+ logger.info(jsonObject.toJSONString());
if (jsonObject == null) {
logger.error("鍋滄RTP鎺ㄦ祦澶辫触: 璇锋鏌LM鏈嶅姟");
} else if (jsonObject.getInteger("code") == 0) {
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index 308fa6b..0e6bfc0 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -154,11 +154,11 @@
* zlm 杩炴帴鎴愬姛鎴栬�厇lm閲嶅惎鍚�
*/
private void zLmRunning(MediaServerConfig mediaServerConfig){
- logger.info("zlm鎺ュ叆鎴愬姛...");
+ logger.info( "[ id: " + mediaServerConfig.getGeneralMediaServerId() + "] zlm鎺ュ叆鎴愬姛...");
if (autoConfig) saveZLMConfig();
MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
if (mediaInfo != null && System.currentTimeMillis() - mediaInfo.getUpdateTime() < 50){
- logger.info("zlm鍒氬垰鏇存柊锛屽拷鐣ヨ繖娆℃洿鏂�");
+ logger.info("[ id: " + mediaServerConfig.getGeneralMediaServerId() + "]zlm鍒氬垰鏇存柊锛屽拷鐣ヨ繖娆℃洿鏂�");
return;
}
mediaServerConfig.setLocalIP(mediaIp);
diff --git a/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java b/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
index e747118..89bcecd 100644
--- a/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
@@ -43,7 +43,7 @@
public void onDevicesFound(List<Device> devices) {
if (devices == null || devices.size() == 0) return;
for (Device device : devices){
- System.out.println(device.getHostName());
+ logger.info(device.getHostName());
deviceMap.put(device.getHostName(), device);
}
}
@@ -53,7 +53,7 @@
public void onDiscoveryFinished() {
ArrayList<String> result = new ArrayList<>();
for (Device device : deviceMap.values()) {
- System.out.println(device.getHostName());
+ logger.info(device.getHostName());
result.add(device.getHostName());
}
callBack.run(0, result);
@@ -71,14 +71,14 @@
@Override
public void onResponse(OnvifDevice onvifDevice, OnvifResponse response) {
- System.out.println("[RESPONSE] " + onvifDevice.getHostName()
+ logger.info("[RESPONSE] " + onvifDevice.getHostName()
+ "======" + response.getErrorCode()
+ "======" + response.getErrorMessage());
}
@Override
public void onError(OnvifDevice onvifDevice, int errorCode, String errorMessage) {
- System.out.println("[ERROR] " + onvifDevice.getHostName() + "======" + errorCode + "=======" + errorMessage);
+ logger.info("[ERROR] " + onvifDevice.getHostName() + "======" + errorCode + "=======" + errorMessage);
callBack.run(errorCode, errorMessage);
}
});
@@ -91,8 +91,8 @@
@Override
public void onMediaProfilesReceived(OnvifDevice device, List<OnvifMediaProfile> mediaProfiles) {
for (OnvifMediaProfile mediaProfile : mediaProfiles) {
- System.out.println(mediaProfile.getName());
- System.out.println(mediaProfile.getToken());
+ logger.info(mediaProfile.getName());
+ logger.info(mediaProfile.getToken());
if (mediaProfile.getName().equals("mainStream")) {
onvifManager.getMediaStreamURI(device, mediaProfile, (OnvifDevice onvifDevice,
OnvifMediaProfile profile, String uri) -> {
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index 8354b56..7e206bf 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -12,6 +12,8 @@
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.stereotype.Component;
@@ -29,6 +31,9 @@
@SuppressWarnings("rawtypes")
@Component
public class VideoManagerStoragerImpl implements IVideoManagerStorager {
+
+ private Logger logger = LoggerFactory.getLogger(VideoManagerStoragerImpl.class);
+
@Autowired
DataSourceTransactionManager dataSourceTransactionManager;
@@ -232,7 +237,7 @@
return false;
}
device.setOnline(1);
- System.out.println("鏇存柊璁惧鍦ㄧ嚎");
+ logger.info("鏇存柊璁惧鍦ㄧ嚎: " + deviceId);
return deviceMapper.update(device) > 0;
}
@@ -244,7 +249,7 @@
*/
@Override
public synchronized boolean outline(String deviceId) {
- System.out.println("鏇存柊璁惧绂荤嚎: " + deviceId);
+ logger.info("鏇存柊璁惧绂荤嚎: " + deviceId);
Device device = deviceMapper.getDeviceByDeviceId(deviceId);
if (device == null) return false;
device.setOnline(0);
@@ -540,7 +545,7 @@
@Override
public void updateMediaList(List<StreamPushItem> streamPushItems) {
if (streamPushItems == null || streamPushItems.size() == 0) return;
- System.out.printf("updateMediaList: " + streamPushItems.size());
+ logger.info("updateMediaList: " + streamPushItems.size());
streamPushMapper.addAll(streamPushItems);
// TODO 寰呬紭鍖�
for (int i = 0; i < streamPushItems.size(); i++) {
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java
index 1672441..53e6a61 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/GpsUtil.java
@@ -7,9 +7,16 @@
import java.util.Base64;
import com.genersoft.iot.vmp.gb28181.bean.BaiduPoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GpsUtil {
+
+ private static Logger logger = LoggerFactory.getLogger(GpsUtil.class);
+
public static BaiduPoint Wgs84ToBd09(String xx, String yy) {
+
+
try {
Socket s = new Socket("api.map.baidu.com", 80);
BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8"));
@@ -26,7 +33,7 @@
String json = "";
String tmp = "";
while ((tmp = br.readLine()) != null) {
- // System.out.println(tmp);
+ // logger.info(tmp);
json += tmp;
}
@@ -44,7 +51,7 @@
return bdPoint;
//return (new String(decode(x)) + "," + new String(decode(y)));
} else {
- System.out.println("gps鍧愭爣鏃犳晥锛侊紒");
+ logger.info("gps鍧愭爣鏃犳晥锛侊紒");
}
out.close();
br.close();
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 0685fb7..874aa5a 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -167,7 +167,7 @@
streamId );
String srcUrl = String.format("rtsp://%s:%s/rtp/%s", "127.0.0.1", mediaInfo.getRtspPort(), streamId);
JSONObject jsonObject = zlmresTfulUtils.addFFmpegSource(srcUrl, dstUrl, "1000000");
- System.out.println(jsonObject);
+ logger.info(jsonObject.toJSONString());
JSONObject result = new JSONObject();
if (jsonObject != null && jsonObject.getInteger("code") == 0) {
result.put("code", 0);
@@ -198,7 +198,7 @@
public ResponseEntity<String> playConvertStop(@PathVariable String key) {
JSONObject jsonObject = zlmresTfulUtils.delFFmpegSource(key);
- System.out.println(jsonObject);
+ logger.info(jsonObject.toJSONString());
JSONObject result = new JSONObject();
if (jsonObject != null && jsonObject.getInteger("code") == 0) {
result.put("code", 0);
--
Gitblit v1.8.0