648540858
|
400eef2d2e
|
临时提交
|
2024-06-27 16:02:43 +08:00 |
|
648540858
|
1616a2a731
|
Merge remote-tracking branch 'gitee-c/dev/master-通道结构重构' into dev/master-通道结构重构
|
2024-06-26 18:41:37 +08:00 |
|
648540858
|
f32eb14125
|
临时提交
|
2024-06-26 18:36:32 +08:00 |
|
648540858
|
81049b5a9e
|
临时提交
|
2024-06-25 17:46:33 +08:00 |
|
648540858
|
26e2e8b2a3
|
更新文档
|
2024-06-25 17:03:28 +08:00 |
|
648540858
|
7255e5a887
|
临时提交
|
2024-06-25 16:59:22 +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
|
68fce9177f
|
临时提交
|
2024-06-25 16:45:31 +08:00 |
|
648540858
|
87c071fd5e
|
合并271分支
|
2024-06-25 10:24:35 +08:00 |
|
648540858
|
57a230afb3
|
Merge branch 'refs/heads/2.7.1'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2024-06-25 09:45:34 +08:00 |
|
panlinlin
|
397ac956de
|
调整通用通道的位置
|
2024-06-21 16:05:13 +08:00 |
|
648540858
|
050882d6a6
|
修复推流时存入推流数据的问题
|
2024-06-20 22:35:48 +08:00 |
|
648540858
|
306c42b4b7
|
临时提交
|
2024-06-20 22:29:50 +08:00 |
|
648540858
|
246c01b1c8
|
重命名通道信息
|
2024-06-20 20:49:17 +08:00 |
|
648540858
|
40bf2d6642
|
添加通道信息
|
2024-06-20 20:24:15 +08:00 |
|
648540858
|
e0c957a0c5
|
Merge branch 'refs/heads/master' into dev/master-通道结构重构
|
2024-06-20 20:06:01 +08:00 |
|
648540858
|
5e82aa5f39
|
优化拉流代理国标级联点播
|
2024-06-20 20:04:48 +08:00 |
|
648540858
|
5c40608458
|
临时提交
|
2024-06-20 20:04:29 +08:00 |
|
648540858
|
45410d8091
|
优化拉流代理国标级联点播
|
2024-06-20 19:46:48 +08:00 |
|
648540858
|
099c65ff40
|
调整点播默认超时时间为10秒
|
2024-06-20 19:30:25 +08:00 |
|
648540858
|
6e4268a670
|
调整推流数据写入redis
|
2024-06-20 18:12:35 +08:00 |
|
648540858
|
f5abf8df4c
|
修改排序
|
2024-06-19 16:00:26 +08:00 |
|
648540858
|
afe80a7be1
|
调整获取监听信息的逻辑
|
2024-06-18 10:00:32 +08:00 |
|
648540858
|
1909c7f71f
|
调整参数名称
|
2024-06-17 10:08:09 +08:00 |
|
648540858
|
b1d9ea8082
|
Merge pull request #1492 from iwanlebron/master
修复参数名称
|
2024-06-17 10:06:51 +08:00 |
|
648540858
|
107caf1171
|
调整前端使用转码后的流
|
2024-06-14 17:24:57 +08:00 |
|
648540858
|
f3ea07bdcd
|
调整转码后的流的输出位置
|
2024-06-14 17:03:55 +08:00 |
|
648540858
|
ee3d87b507
|
Update bug.md
|
2024-06-14 11:32:52 +08:00 |
|
648540858
|
aa56bb3c26
|
优化docker内ip变化的情况
|
2024-06-14 09:47:19 +08:00 |
|
panlinlin
|
07a8ef9e25
|
SIP只有一个监听时，直接返回
|
2024-06-14 00:03:57 +08:00 |
|
panlinlin
|
70e6d919e9
|
设备使用的注册网卡信息变化时，更新设备信息
|
2024-06-13 23:40:32 +08:00 |
|
panlinlin
|
317c5455c6
|
修复位置信息保存失败的BUG
|
2024-06-13 23:19:26 +08:00 |
|
panlinlin
|
7b46769a16
|
修复国标录像下载后负载统计未清除的BUG
|
2024-06-13 23:15:51 +08:00 |
|
648540858
|
da2662ab27
|
国标28181-支持自动识别网卡监听，可以不再配置SIP.IP
|
2024-06-13 18:10:01 +08:00 |
|
648540858
|
4ad711f61a
|
去除调试日志日志
|
2024-06-13 16:21:34 +08:00 |
|
648540858
|
c1b0365b02
|
增加设备上线判断双逻辑，兼容华为设备（前一条的描述大华是错误的，大华没有这个问题）注册后不再发送注册的设备
|
2024-06-12 11:16:21 +08:00 |
|
648540858
|
6c9d213394
|
Merge remote-tracking branch 'origin/master'
|
2024-06-12 11:10:22 +08:00 |
|
648540858
|
0ac27b03ff
|
增加设备上线判断双逻辑，兼容大华注册后不再发送注册的设备
|
2024-06-12 11:10:10 +08:00 |
|
panlinlin
|
b070b57259
|
拉流代理状态变化时，支持推送到国标平台
|
2024-06-11 23:10:12 +08:00 |
|
648540858
|
2cf7178cb7
|
Merge branch 'refs/heads/2.7.1'
|
2024-06-11 10:14:14 +08:00 |
|
648540858
|
f8ef14bfea
|
修复移动位置位置订阅上报间隔为0的bug
|
2024-06-11 10:08:13 +08:00 |
Iwan Lebron
|
5bc3a71764
|
Merge pull request #1 from iwanlebron/iwanlebron-patch-1
修复参数名称
|
2024-06-10 09:19:16 +08:00 |
|
Iwan Lebron
|
f6157cc42c
|
修复参数名称
|
2024-06-10 09:18:37 +08:00 |
|
648540858
|
8377d4a1c7
|
Merge pull request #1489 from Duktig-Jay/bug_fix-录像下载失败未正常释放ssrc
[bugfix]录像下载失败未正常释放ssrc
|
2024-06-09 20:47:55 +08:00 |
wangxinlong
|
208e034822
|
录像下载失败未正常释放ssrc
|
2024-06-07 18:13:45 +08:00 |
|
648540858
|
619a86e0ed
|
修复循环引用
|
2024-06-06 19:59:48 +08:00 |
|
648540858
|
2226d34898
|
修复空指针异常
|
2024-06-06 00:29:52 +08:00 |
|
648540858
|
2127cbeca3
|
调整收到移动位置订阅后开启定时任务
|
2024-06-05 22:45:13 +08:00 |
|
648540858
|
764d04b497
|
调整上级观看消息的发送
|
2024-05-29 15:02:51 +08:00 |
|
648540858
|
bec35ebf94
|
调整录像进度获取流程
|
2024-05-28 16:06:08 +08:00 |