648540858
2024-06-25 57a230afb3b02cedf8ec39cd60e5163f953e3260
refs
用户 648540858 <648540858@qq.com>
星期二, 六月 25, 2024 09:45 +0800
提交者 648540858 <648540858@qq.com>
星期二, 六月 25, 2024 09:45 +0800
提交57a230afb3b02cedf8ec39cd60e5163f953e3260
目录 288cc487f42904926bc137de4b3ba0ed66079235 目录 | zip | gz
parent 5e82aa5f39981e6ba0909a493f091954cebd24c8 查看 | 对比
050882d6a614f87d33d90bc5b344c774d9f6e71d 查看 | 对比
Merge branch 'refs/heads/2.7.1'

# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
9个文件已修改
84 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java 8 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java 8 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java 29 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
web_src/src/components/dialog/devicePlayer.vue 8 ●●●● 对比 | 查看 | 原始文档 | blame | 历史