wvp-GB28181-pro/src/main/java/com/genersoft/iot/vmp
648540858 197f80581b Merge branch 'main' into main2
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
2023-02-10 16:25:33 +08:00
..
common Merge branch 'wvp-28181-2.0' 2023-02-10 16:24:27 +08:00
conf Merge branch 'main' into main2 2023-02-10 16:25:33 +08:00
gb28181 Merge branch 'main' into main2 2023-02-10 16:25:33 +08:00
media/zlm Merge branch 'main' into main2 2023-02-10 16:25:33 +08:00
service Merge branch 'main' into main2 2023-02-10 16:25:33 +08:00
storager Merge branch 'wvp-28181-2.0' 2023-02-10 16:24:27 +08:00
utils fix(JsonUtil): 修复 Redis 中 Object 序列化与反序列化不一致导致报错的问题 2023-02-04 18:13:47 +08:00
vmanager Merge branch 'main' into main2 2023-02-10 16:25:33 +08:00
web/gb28181 优化兼容接口 2022-12-28 10:58:48 +08:00
VManageBootstrap.java 同时支持打包为Jar和War 2023-02-07 20:59:33 +08:00