648540858
|
da441a67f8
|
临时提交
|
2024-09-06 17:56:24 +08:00 |
|
648540858
|
26919170f4
|
临时提交
|
2024-09-05 17:59:17 +08:00 |
|
648540858
|
568abbcd9d
|
临时提交
|
2024-09-04 23:06:27 +08:00 |
|
648540858
|
ad5b66eb71
|
临时提交
|
2024-09-04 18:01:54 +08:00 |
|
648540858
|
9a0f1512c9
|
临时提交
|
2024-09-04 10:49:34 +08:00 |
|
648540858
|
fa47f619ba
|
临时提交
|
2024-09-03 18:00:35 +08:00 |
|
648540858
|
dd794d4868
|
临时提交
|
2024-08-27 17:56:49 +08:00 |
|
648540858
|
5a259aaa63
|
临时提交
|
2024-08-24 00:18:54 +08:00 |
|
648540858
|
9247c7e805
|
完善国标级联点播推流，拉流代理，国标
|
2024-08-17 22:31:13 +08:00 |
|
648540858
|
cce1d1de40
|
重构INVITE消息处理中的上级点播请求
|
2024-08-14 17:19:19 +08:00 |
|
648540858
|
ad240ba9a4
|
优化国标级联点播逻辑
|
2024-08-13 17:57:25 +08:00 |
|
648540858
|
16708e385b
|
支持多WVP的推流播放
|
2024-08-09 16:27:08 +08:00 |
|
648540858
|
9aad6ac719
|
临时提交
|
2024-08-08 17:47:08 +08:00 |
|
panlinlin
|
3e220a2c1e
|
临时提交
|
2024-08-07 23:45:29 +08:00 |
|
648540858
|
5abf5012eb
|
完善分组通道管理
|
2024-08-07 17:12:39 +08:00 |
|
648540858
|
a3f7753b84
|
Merge branch 'refs/heads/master' into dev/master-通道结构重构
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# web_src/src/components/PushVideoList.vue
|
2024-08-07 11:17:34 +08:00 |
|
648540858
|
c88681c7ad
|
合并分支
|
2024-08-07 10:41:54 +08:00 |
|
Iwan Lebron
|
c7c94ee73d
|
修复 ZLMServerFactory 日志不打印
|
2024-08-01 14:47:43 +08:00 |
|
648540858
|
6bd0cdd37b
|
临时提交
|
2024-07-23 18:00:47 +08:00 |
|
panlinlin
|
80ac701748
|
临时提交
|
2024-07-20 06:44:53 +08:00 |
|
648540858
|
9f4e66a38b
|
优化拉流代理
|
2024-07-19 17:54:14 +08:00 |
|
648540858
|
9d37e96f06
|
修复空指针异常
|
2024-07-15 16:30:21 +08:00 |
|
648540858
|
b98cfd1fed
|
使用Slf4j注解打印日志
|
2024-07-03 17:24:35 +08:00 |
|
648540858
|
799932f614
|
优化日志以及属性设置代码
|
2024-07-03 16:14:18 +08:00 |
|
648540858
|
b630190e30
|
临时提交
|
2024-06-28 18:06:09 +08:00 |
|
panlinlin
|
019af90f6e
|
临时提交
|
2024-06-28 07:36:28 +08:00 |
|
panlinlin
|
9c0e69c6c5
|
临时提交
|
2024-06-28 06:48:49 +08:00 |
|
648540858
|
88c021948f
|
临时提交
|
2024-06-27 18:41:58 +08:00 |
|
648540858
|
400eef2d2e
|
临时提交
|
2024-06-27 16:02:43 +08:00 |
|
648540858
|
f32eb14125
|
临时提交
|
2024-06-26 18:36:32 +08:00 |
|
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 |
|
648540858
|
87c071fd5e
|
合并271分支
|
2024-06-25 10:24:35 +08:00 |
|
648540858
|
306c42b4b7
|
临时提交
|
2024-06-20 22:29:50 +08:00 |
|
648540858
|
da2662ab27
|
国标28181-支持自动识别网卡监听，可以不再配置SIP.IP
|
2024-06-13 18:10:01 +08:00 |
|
648540858
|
764d04b497
|
调整上级观看消息的发送
|
2024-05-29 15:02:51 +08:00 |
|
648540858
|
bec35ebf94
|
调整录像进度获取流程
|
2024-05-28 16:06:08 +08:00 |
|
648540858
|
de390d3982
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2024-05-28 10:16:46 +08:00 |
|
648540858
|
1efabbe4cc
|
支持把推流的额外参数加入redis缓存
|
2024-05-24 10:50:29 +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
|
2daa59d78c
|
支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题
|
2024-05-23 17:10:45 +08:00 |
|
648540858
|
d70bfb53dd
|
修复兼容zlm-pro转码时无人管看自动移除失败的BUG
|
2024-05-20 11:37:07 +08:00 |
|
648540858
|
49101a37e0
|
兼容zlm-pro转码
|
2024-05-17 16:32:01 +08:00 |
|
bradyx
|
6e8071d820
|
fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。
|
2024-05-15 13:52:16 +08:00 |
|
648540858
|
588b1da35a
|
Merge branch 'refs/heads/2.7.0' into 271-优化notify存储
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
|
2024-05-13 11:12:20 +08:00 |
|
648540858
|
e6a850891e
|
支持移动位置订阅通知的数据存储
|
2024-05-11 17:48:47 +08:00 |
|
648540858
|
17e9631de4
|
修复多节点时端口丢失的问题
|
2024-05-09 23:53:36 +08:00 |
|
648540858
|
632075da9b
|
优化接收BYE消息后的处理
|
2024-05-09 23:41:27 +08:00 |
|
648540858
|
edfd528dd5
|
Merge remote-tracking branch 'origin/master'
|
2024-04-30 15:01:43 +08:00 |
|
WuPeng
|
424c0b6333
|
修改on_stream_none_reader返回值
|
2024-04-28 14:31:38 +08:00 |
|