648540858
2023-07-13 668dc8f0dd8b667a95838eb5d0083a101aa2b6b0
refs
用户 648540858 <648540858@qq.com>
星期四, 七月 13, 2023 14:47 +0800
提交者 648540858 <648540858@qq.com>
星期四, 七月 13, 2023 14:47 +0800
提交668dc8f0dd8b667a95838eb5d0083a101aa2b6b0
目录 7bf41b9bb87d3451658ba58834f7a164181c7809 目录 | zip | gz
parent 14eee911ebf3ee48a25dcf71baa30fc2761cbcec 查看 | 对比
9fc3db1f5e381378fd54818e0ba017df6be96fa9 查看 | 对比
Merge branch '2.6.8' into wvp-28181-2.0

# 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/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
7个文件已修改
1个文件已添加
377 ■■■■ 已修改文件
sql/2.6.8补丁更新.sql 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java 1 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java 5 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookType.java 3 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/bean/OtherRtpSendInfo.java 89 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java 260 ●●●● 对比 | 查看 | 原始文档 | blame | 历史