648540858 2e7c9a7341 Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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/media/zlm/AssistRESTfulUtils.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java # src/main/resources/all-application.yml # src/main/resources/application-dev.yml		2024-02-07 20:30:37 +08:00
..
css	国标录像UI重构	2023-01-09 16:31:51 +08:00
file	1.根据redis消息更新推流列表时同时更新在线状态	2022-09-07 15:56:48 +08:00
fonts/poppins	解决串流，解决编辑上级平台却新建了的问题	2021-04-15 17:48:52 +08:00
images	更新同步wvp	2022-05-06 11:56:29 +08:00
js	Merge branch 'wvp-28181-2.0' into main-dev	2024-02-07 20:30:37 +08:00
.gitkeep	修复子节点显示错误	2020-10-12 10:11:24 +08:00
EasyPlayer.swf	补充swf文件	2021-07-08 14:48:00 +08:00
favicon.ico	优化级联添加通道流程	2022-02-15 17:41:09 +08:00
libDecoder.wasm	优化播放器以及部分日志	2021-04-21 18:14:45 +08:00
logo.png	添加logo	2021-08-30 16:06:42 +08:00