648540858 f223aad705 Merge branch 'wvp-28181-2.0' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java # src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # web_src/src/components/dialog/devicePlayer.vue		2022-11-18 18:39:44 +08:00
..
AudioBroadcastResult.java	添加界面优化接口	2022-07-01 18:26:35 +08:00
BaseTree.java	优化国标树型展示	2022-07-03 07:40:54 +08:00
BatchGBStreamParam.java	依赖包版本升级	2022-08-19 17:11:51 +08:00
DeferredResultEx.java	优化使用来源ip作为流ip	2022-11-10 09:40:01 +08:00
DeferredResultFilter.java	优化使用来源ip作为流ip	2022-11-10 09:40:01 +08:00
ErrorCode.java	支持全局异常和统一返回结果，未完待续	2022-08-22 16:17:28 +08:00
PlayTypeEnum.java	支持全局异常和统一返回结果，未完待续	2022-08-22 16:17:28 +08:00
ResourceBaceInfo.java	首页改造完成,待添加系统信息	2022-10-24 15:20:35 +08:00
ResourceInfo.java	首页改造完成,待添加系统信息	2022-10-24 15:20:35 +08:00
StreamPushExcelDto.java	1.根据redis消息更新推流列表时同时更新在线状态	2022-09-07 15:56:48 +08:00
SystemConfigInfo.java	首页改造完成,添加系统信息	2022-10-24 18:14:31 +08:00
WVPResult.java	优化多网卡下的localIp获取	2022-11-17 17:01:54 +08:00