From 45e9fc880c61e12d6415755ee2a29f79fcf81fbb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 11 三月 2022 09:49:38 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
index bd05344..5813998 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
@@ -21,6 +21,7 @@
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
import javax.sip.SipException;
+import javax.sip.header.CSeqHeader;
import javax.sip.header.CallIdHeader;
import javax.sip.message.Response;
import java.text.ParseException;
@@ -64,6 +65,11 @@
String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
// 鏌ヨ璁惧鏄惁瀛樺湪
+ CSeqHeader cseqHeader = (CSeqHeader) evt.getRequest().getHeader(CSeqHeader.NAME);
+ String method = cseqHeader.getMethod();
+ if (method.equals("MESSAGE")) {
+ System.out.println();
+ }
Device device = redisCatchStorage.getDevice(deviceId);
// 鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪
ParentPlatform parentPlatform = storage.queryParentPlatByServerGBId(deviceId);
@@ -77,7 +83,14 @@
sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()).response(eventResult);
};
}else {
- Element rootElement = getRootElement(evt);
+ Element rootElement = null;
+ try {
+ rootElement = getRootElement(evt);
+ } catch (DocumentException e) {
+ logger.warn("瑙ｆ瀽XML娑堟伅鍐呭寮傚父", e);
+ // 涓嶅瓨鍦ㄥ垯鍥炲404
+ responseAck(evt, Response.BAD_REQUEST, e.getMessage());
+ }
String name = rootElement.getName();
IMessageHandler messageHandler = messageHandlerMap.get(name);
if (messageHandler != null) {
@@ -98,8 +111,6 @@
logger.warn("鍙傛暟鏃犳晥", e);
} catch (ParseException e) {
logger.warn("SIP鍥炲鏃惰В鏋愬紓甯�", e);
- } catch (DocumentException e) {
- logger.warn("瑙ｆ瀽XML娑堟伅鍐呭寮傚父", e);
}
}
--
Gitblit v1.8.0