lin 01c71f8800 Merge branch 'refs/heads/dev/压力测试' into 报警管理 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java		2026-03-31 09:10:02 +08:00
..
common	Merge branch 'master' into dev/压力测试	2026-03-30 11:23:47 +08:00
conf	添加定时任务配置类并记录心跳更新日志	2026-03-30 17:00:11 +08:00
gb28181	Merge branch 'refs/heads/dev/压力测试' into 报警管理	2026-03-31 09:10:02 +08:00
jt1078	Merge branch 'master' into dev/压力测试	2026-03-30 11:23:47 +08:00
media	Merge branch 'master' into dev/压力测试	2026-03-30 11:23:47 +08:00
service	Merge branch 'refs/heads/dev/压力测试' into 报警管理	2026-03-31 09:10:02 +08:00
storager	为心跳历史和注册历史设置过期时间	2026-01-27 14:21:41 +08:00
streamProxy	Merge branch 'master' into dev/压力测试	2026-03-30 11:23:47 +08:00
streamPush	Merge branch 'master' into dev/压力测试	2026-03-30 11:23:47 +08:00
utils	开启虚拟线程，修改代码已使用虚拟线程	2026-01-14 11:02:58 +08:00
vmanager	统一使用MediaApp枚举，调整关闭逻辑	2026-02-21 23:14:55 +08:00
web	优化RTP服务器相关代码，统一使用MediaApp枚举，简化参数传递，调整配置以提高兼容性	2026-02-20 22:33:26 +08:00
VManageBootstrap.java	优化注册参数	2026-01-19 21:47:15 +08:00