648540858 5a7a7a12bd Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.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/response/impl/InviteResponseProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # src/main/resources/all-application.yml # web_src/config/index.js # web_src/src/components/dialog/devicePlayer.vue		2023-06-27 16:46:26 +08:00
..
AudioBroadcastResult.java	修复语音对讲返回的地址	2023-02-07 14:52:33 +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	优化截图获取接口	2023-06-05 11:10:15 +08:00
PlayTypeEnum.java	支持全局异常和统一返回结果，未完待续	2022-08-22 16:17:28 +08:00
ResourceBaseInfo.java	优化部分sql实现	2023-05-15 15:29:39 +08:00
ResourceInfo.java	优化部分sql实现	2023-05-15 15:29:39 +08:00
SnapPath.java	优化截图获取接口	2023-06-05 11:10:15 +08:00
StreamContent.java	去除redis工具类直接使用RedisTemplate存取数据	2023-04-03 10:26:55 +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	支持不同域的前后端分离部署	2023-03-15 19:05:56 +08:00