648540858 e4c11bfebe Merge branch 'refs/heads/master' into dev/master-通道结构重构 ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java

2024-06-25 16:46:47 +08:00

..

bean

Merge branch 'refs/heads/2.7.1'

2024-06-25 09:45:34 +08:00

cloudRecord

合并271分支

2024-05-23 17:47:43 +08:00

gb28181

国标28181-支持自动识别网卡监听，可以不再配置SIP.IP

2024-06-13 18:10:01 +08:00

log

临时提交

2024-04-18 17:22:25 +08:00

ps

调整上级观看消息的发送

2024-05-29 15:02:51 +08:00

rtp

调整上级观看消息的发送

2024-05-29 15:02:51 +08:00

server

支持abl hook

2024-04-01 18:21:38 +08:00

streamProxy

临时提交

2024-06-20 22:29:50 +08:00

streamPush

临时提交

2024-06-20 22:29:50 +08:00

user

适配postgres数据库

2024-04-10 22:16:56 +08:00