Commit Graph

14 Commits

Author SHA1 Message Date
648540858
da2662ab27 国标28181-支持自动识别网卡监听,可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858
aeeb61d141 合并271分支 2024-05-23 17:47:43 +08:00
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
648540858
651d4a1b0e 优化代码调用 2024-04-11 14:28:42 +08:00
648540858
bbf19c7909 合并主线 2024-04-09 10:40:16 +08:00
648540858
8b90fade9e 支持使用abl接收国标流 2024-04-02 00:05:09 +08:00
648540858
33b75be71a 支持abl hook 2024-04-01 18:21:38 +08:00
648540858
ecd1d2a414 临时提交 2024-04-01 15:22:45 +08:00
648540858
4548695a0b hook优化 2024-03-31 00:28:45 +08:00
648540858
c6dfb63f8f 优化hook通知 2024-03-25 23:59:50 +08:00
648540858
150e7a3199 调整节点管理代码结构 2024-03-22 16:45:18 +08:00
648540858
b90dc789b4 优化媒体节点服务的代码结构 2024-03-21 23:39:32 +08:00
648540858
4134c73745 优化Track的构建 2024-03-21 22:38:56 +08:00
648540858
c7ca9703c1 优化媒体节点服务的代码结构 2024-03-20 23:50:30 +08:00