648540858
2023-07-31 3cada227435934da8a2db49939695f870b7f477e
refs
用户 648540858 <648540858@qq.com>
星期一, 七月 31, 2023 15:28 +0800
提交者 648540858 <648540858@qq.com>
星期一, 七月 31, 2023 15:28 +0800
提交3cada227435934da8a2db49939695f870b7f477e
目录 79b17747878867d8b4c418f213cbd54e7a27f9c7 目录 | zip | gz
parent 7d3cbb8253ec3dc7f4004ae67371f852727909df 查看 | 对比
59d8f2f9152b3c3106abae64bef343cde842f225 查看 | 对比
Merge branch 'wvp-28181-2.0' into main-dev

# Conflicts:
# 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/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
9个文件已修改
1个文件已添加
180 ■■■■ 已修改文件
sql/2.6.9更新.sql 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
sql/初始化.sql 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java 45 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java 1 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java 94 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/IPlayService.java 3 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史