From 8bd2f47c9a92ffcf5ae43fae965eaefd4748e263 Mon Sep 17 00:00:00 2001
From: lishuyuan <lishuyuan@inspur.com>
Date: 星期四, 02 十一月 2023 10:17:47 +0800
Subject: [PATCH] bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
old mode 100644
new mode 100755
index 84ccc0b..63299b2
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
@@ -11,11 +11,9 @@
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
@@ -36,6 +34,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.text.ParseException;
import java.util.UUID;
@@ -54,13 +54,7 @@
private SIPCommander cmder;
@Autowired
- private ZLMServerFactory ZLMServerFactory;
-
- @Autowired
private IVideoManagerStorage storager;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
@Autowired
private IInviteStreamService inviteStreamService;
@@ -107,7 +101,15 @@
if (data != null) {
StreamInfo streamInfo = (StreamInfo)data;
if (userSetting.getUseSourceIpAsStreamIp()) {
- streamInfo.channgeStreamIp(request.getLocalAddr());
+ streamInfo=streamInfo.clone();//娣辨嫹璐�
+ String host;
+ try {
+ URL url=new URL(request.getRequestURL().toString());
+ host=url.getHost();
+ } catch (MalformedURLException e) {
+ host=request.getLocalAddr();
+ }
+ streamInfo.channgeStreamIp(host);
}
wvpResult.setData(new StreamContent(streamInfo));
}
--
Gitblit v1.8.0