648540858
2023-07-01 975ace051bb6ed708090d7a15281a062a0d6dbc2
refs
用户 648540858 <648540858@qq.com>
星期六, 七月 1, 2023 18:28 +0800
提交者 648540858 <648540858@qq.com>
星期六, 七月 1, 2023 18:28 +0800
提交975ace051bb6ed708090d7a15281a062a0d6dbc2
目录 5abccf651ebbfd6eb10f60f1d11aa2c60d15a36d 目录 | zip | gz
parent 74ad4235f1738ea8ca954bd396a35ddf90a6e37b 查看 | 对比
b64f32080537840cfd772d14dfc1df1ccddc4330 查看 | 对比
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/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
16个文件已修改
2个文件已添加
447 ■■■■■ 已修改文件
sql/2.6.8升级2.6.9.sql 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
sql/初始化.sql 1 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java 18 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java 16 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java 19 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java 55 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java 137 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaSendRtpPortInfo.java 50 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java 37 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java 4 ●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
web_src/src/components/dialog/MediaServerEdit.vue 22 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
web_src/src/components/dialog/StreamProxyEdit.vue 24 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史