648540858
2024-01-31 fc74ce9de4c38d56ee429893758776eeb5432e9b
refs
用户 648540858 <648540858@qq.com>
星期三, 一月 31, 2024 17:25 +0800
提交者 648540858 <648540858@qq.com>
星期三, 一月 31, 2024 17:25 +0800
提交fc74ce9de4c38d56ee429893758776eeb5432e9b
目录 c8cea3342405e212908452be42f6747886ae4082 目录 | zip | gz
parent 33b125262b9bc6443ea2edbaac306fdbeb0dc7e5 查看 | 对比
68fbc8fef1ba8d77472e6b849c9265fff751ec31 查看 | 对比
Merge branch '2.6.9' into wvp-28181-2.0

# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/resources/application-dev.yml
7个文件已修改
29 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java 11 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java 1 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/resources/all-application.yml 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史