From ef5018de2d86bd4728a75ddc0eccd11b812375dc Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Thu, 13 Jul 2023 14:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/conf/MediaConfig.java | 8 -------- .../iot/vmp/gb28181/conf/ServerLoggerImpl.java | 3 ++- .../iot/vmp/vmanager/rtp/RtpController.java | 12 +----------- .../iot/vmp/web/gb28181/ApiDeviceController.java | 14 ++------------ src/main/resources/wvpssl.jks | Bin 2196 -> 0 bytes 5 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 src/main/resources/wvpssl.jks diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java index 93d265e4..20ed8cb1 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java @@ -233,12 +233,4 @@ public class MediaConfig{ } return false; } - - public String getRtpSendPortRange() { - return rtpSendPortRange; - } - - public void setRtpSendPortRange(String rtpSendPortRange) { - this.rtpSendPortRange = rtpSendPortRange; - } } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java index 19e1906c..c7b1f6e6 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java @@ -1,5 +1,6 @@ package com.genersoft.iot.vmp.gb28181.conf; +import gov.nist.core.CommonLogger; import gov.nist.core.ServerLogger; import gov.nist.core.StackLogger; import gov.nist.javax.sip.message.SIPMessage; @@ -84,7 +85,7 @@ public class ServerLoggerImpl implements ServerLogger { } if(sipStack instanceof SIPTransactionStack) { this.sipStack = (SIPTransactionStack)sipStack; - this.stackLogger = this.sipStack.getStackLogger(); + this.stackLogger = CommonLogger.getLogger(SIPTransactionStack.class); } } } diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java index c4c1df99..94f1ba75 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java @@ -7,16 +7,12 @@ import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.conf.exception.ControllerException; import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager; import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory; -import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager; -import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory; import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe; import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory; import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForRtpServerTimeout; import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForStreamChange; import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRtpServerTimeoutHookParam; -import com.genersoft.iot.vmp.service.IDeviceChannelService; -import com.genersoft.iot.vmp.service.IDeviceService; import com.genersoft.iot.vmp.service.IMediaServerService; import com.genersoft.iot.vmp.utils.redis.RedisUtil; import com.genersoft.iot.vmp.vmanager.bean.ErrorCode; @@ -39,7 +35,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeUnit; @SuppressWarnings("rawtypes") @Tag(name = "第三方服务对接") @@ -62,16 +57,12 @@ public class RtpController { @Autowired private IMediaServerService mediaServerService; - @Autowired - private SendRtpPortManager sendRtpPortManager; - @Autowired private UserSetting userSetting; @Autowired private DynamicTask dynamicTask; - @Autowired private RedisTemplate redisTemplate; @@ -136,7 +127,7 @@ public class RtpController { } }); } - String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + callId; + String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_" + callId; OtherRtpSendInfo otherRtpSendInfo = new OtherRtpSendInfo(); otherRtpSendInfo.setReceiveIp(mediaServerItem.getSdpIp()); otherRtpSendInfo.setReceivePortForVideo(localPortForVideo); @@ -147,7 +138,6 @@ public class RtpController { // 将信息写入redis中，以备后用 redisTemplate.opsForValue().set(receiveKey, otherRtpSendInfo); if (isSend != null && isSend) { - String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_" + callId; // 预创建发流信息 int portForVideo = sendRtpPortManager.getNextPort(mediaServerItem.getId()); int portForAudio = sendRtpPortManager.getNextPort(mediaServerItem.getId()); diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java index d8c20930..7b59f7f7 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java +++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java @@ -18,7 +18,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -115,20 +114,11 @@ public class ApiDeviceController { @RequestParam(required = false)String q, @RequestParam(required = false)Boolean online ){ -// if (logger.isDebugEnabled()) { -// logger.debug("查询所有视频设备API调用"); -// } + JSONObject result = new JSONObject(); - // 查询设备是否存在 -// Device device = storager.queryVideoDevice(serial); -// if (device == null) { -// result.put("ChannelCount", 0); -// result.put("ChannelList", "[]"); -// return result; -// } List deviceChannels; List channelIds = null; - if (!StringUtils.isEmpty(code)) { + if (!ObjectUtils.isEmpty(code)) { String[] split = code.trim().split(","); channelIds = Arrays.asList(split); } diff --git a/src/main/resources/wvpssl.jks b/src/main/resources/wvpssl.jks deleted file mode 100644 index 92b98b77a52553ec4fc23caf8bb08d5af33b18f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2196 zcmcK4`8(8$9tZIG&Wte(L&m<(Oo+^w(BLR#$xvwK7@4sm1x%YWaf583W^TX?>&+}QH_x|esDhLDu9~SVvV4)$D zz(DdLBVF=&)IlH~Fo6c$Cm><`$6){zPy-(U03HyO23_Xbs*D)a>A11Bq5gZqBexNv zmOhFTsPLm-o%Xe#&@2NUj<}EPK9O#cPTSGFGCSv@qn!83YoM)k4W&y^~2HdC?2G+UI&Pi&)V{KA7UpWOzpYDIH@KfA!1=8Y!_BXxD! zWlnus{l;@EaRf~YiV59%$e|i}s5WF3Un9D6QfN`Q2C(*>UV5>gtDN#yH8Qy$ zU9invV@L2Y!^Q#9)l(ZqJMMUI>CyHFKMh@A)pTlm&A&=b$+2oh3)$n#PVSv3*N3NM z0vSb?@?%NExTESBcV{EnBUa*DP^`p+UyN8E{{>3IP zsP)fbu_fLNLRv*k6vKfw(sq88@}>TzP^#lRMH#Y-a4}p_e^=KqoJn5?sUm|c#$r+0 z%`w-%I2~~7XRCZU0_YV(8dTy>QT}_0Ro9Z#0>AWhI_lQ^0GGh=DqCjmpIcK=C6A{IAmv^P zXL%Q~ZN<#3QK z&hG|#Jb22TcF%TMOx=O2uHDDJP}nuPYv^03kjcDuemg)dN3Oo-GkuGkv0z%~A9$+I zP`nha-c;4QeRQf?op0>YA4_+=(u#Xpy1!!74rHLC! z#TThM6_p}FYziiAK;{wWU09rGuJvevtls#%f9ROD{cMf5a({t=`- z36gT#g!C@h?oky-$a+>UWFfI+?f93H%NWavgKG`$ZpX`95Xktc&A-<}8U6 z(j}oS>c=Z5wbafDqB_)ypHBq8aum|q6Pmn2MQkCkvbR1k`{0fbnk#7}nSIf=!mp<6 zb`SB&$DyV>?$F}y0w~(}j8?;lT}3!Xu3`q)i&A3yZbWfRJwUcC*$2mw82)U@Ele3w z67WqtX7Ax+5o9h>&b#vSLyNqNI}G^tQ^@FyL3K3rF@o6H6DUm1i{8BR)=qoS_!A3- zV@im0Gy?4nY3zl$PwMV&m%k*$*<=JwE~Ekh%h8xR;<)!DQ%7q566~20?s7PuH)9VB z0YE@0nxH_CJG{6Y5-JWAb?EeuBfWvg^-}7enTvF*PTqM>|K}19f8=n904OIR!|)Gf zYh{L5u0buSr!5530k#)mS(RYZCRsj+76>M%u5X8p)#eH^P+-a_KENGc} z%g{i^|D(9?BTK>I2K1CK%p&yadM(FUGFY&wtjipq<4vitwirj?ew|y}7bj)4>s;4u2;~fy6g-F?kDQtIvo`6KE}W@iXcX zYzGI6>i1V2OxQHJ^_783E=N_TswIEk4#0R=akOh1dQjMz=$@hp? MBy-i6op7^%1J2R82><{9