648540858 2c89fae49a Merge branch 'refs/heads/2.7.1' ...

# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java

2024-05-23 17:32:15 +08:00

..

bean

优化媒体节点服务的代码结构

2024-03-21 23:39:32 +08:00

cloudRecord

Merge branch 'refs/heads/2.7.1'

2024-05-23 17:32:15 +08:00

gb28181

Merge branch 'refs/heads/2.7.1'

2024-05-23 17:32:15 +08:00

log

临时提交

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

ps

优化代码调用

2024-04-10 22:38:12 +08:00

rtp

优化代码调用

2024-04-10 22:38:12 +08:00

server

支持abl hook

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

streamProxy

支持abl hook

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

streamPush

修改totalReaderCount类型

2024-04-12 10:36:18 +08:00

user

适配postgres数据库

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