648540858 b1b6fae22c Merge branch 'master' into dev/zlm ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java # src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java # src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java		2024-04-09 10:35:11 +08:00
..
auth	修复 设备注册时报错 #799	2023-03-31 09:10:16 +08:00
bean	Merge branch 'master' into dev/zlm	2024-04-09 10:35:11 +08:00
conf	增加日志记录时的完全限定类名，用于定位日志位置。	2023-12-12 16:41:15 +08:00
event	hook优化	2024-03-31 00:28:45 +08:00
session	hook优化	2024-03-31 00:28:45 +08:00
task	支持abl hook	2024-04-01 18:21:38 +08:00
transmit	Merge branch 'master' into dev/zlm	2024-04-09 10:35:11 +08:00
utils	调整ptzType字段名称	2024-03-18 17:41:49 +08:00
SipLayer.java	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00