648540858 43ef195543 Merge branch '2.6.8' into wvp-28181-2.0 ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java

2023-07-03 16:54:09 +08:00

..

common

Merge branch '2.6.8' into wvp-28181-2.0

2023-07-03 16:54:09 +08:00

conf

优化发流逻辑

2023-07-01 18:10:33 +08:00

gb28181

优化字段名称

2023-07-03 10:36:02 +08:00

jt1078

1、新增视频回放、视频回放控制Template

2023-04-28 14:39:50 +08:00

media/zlm

Merge branch '2.6.8' into wvp-28181-2.0

2023-07-03 16:54:09 +08:00

service

优化字段名称

2023-07-03 10:36:02 +08:00

storager

Merge branch '2.6.8' into wvp-28181-2.0

2023-07-03 16:54:09 +08:00

utils

添加获取截图接口

2023-05-29 23:28:06 +08:00

vmanager

Merge branch '2.6.8' into wvp-28181-2.0

2023-07-03 16:54:09 +08:00

web/gb28181

优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895

2023-06-22 22:35:35 +08:00

VManageBootstrap.java

去除druid数据库连接池，使用spring支持的hikari

2023-03-29 09:44:45 +08:00