aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-22 05:17:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,957 Commits 27 Branches 1 Tag 209 MiB
5a75381a00
Commit Graph

603 Commits

Author SHA1 Message Date
648540858
5a75381a00 基于新的云端录像结构实现国标录像 2023-10-17 15:34:01 +08:00
648540858
7aa8444e67 临时提交 2023-10-13 18:25:36 +08:00
648540858
205f1f1f60 优化国标级联心跳失败再次注册的逻辑 2023-10-08 15:41:24 +08:00
648540858
c084d6c98a 优化国标级联心跳失败判断逻辑 2023-10-07 18:00:08 +08:00
648540858
4c28f380aa 优化byte数组转换 2023-10-07 14:52:46 +08:00
648540858
b9a33f03d6 国标级联支持添加通道后主动推动到上级 2023-09-22 17:46:31 +08:00
648540858
f57ed350b3 添加设置mobilePosition中ChannelId #1054 2023-09-11 11:01:20 +08:00
648540858
cde7f6460a
Merge pull request #999 from a24211317/wvp-28181-2.0 
解决两个国标平台相互级联时，上级不能获取目录的问题
 2023-09-01 09:21:05 +08:00
ChengHong
d0ef68af3f
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-08-31 17:08:13 +08:00
yangjunyi
1b81080f6f 修复通道目录同步异常问题 2023-08-29 14:23:28 +08:00
648540858
760b14eaaa 恢复级联点播 2023-08-25 09:14:38 +08:00
648540858
3951a95284 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2023-08-25 08:56:47 +08:00
648540858
23ce55260f 修复级联点播 2023-08-25 08:51:06 +08:00
648540858
91e49745e4 修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
chenghong
bac19f583c 解决两个国标平台相互级联时，上级不能获取目录的问题 2023-08-14 11:44:41 +08:00
648540858
eefd6a0e21
Merge pull request #993 from a24211317/wvp-28181-2.0 
平台保活消息增加回复200OK
 2023-08-11 09:12:19 +08:00
chenzhangyue
dd2ae65786 修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted 2023-08-10 20:00:43 +08:00
chenghong
4ca97d3174 平台保活消息增加回复200OK 2023-08-09 16:18:19 +08:00
648540858
470625e077 支持全局固定流地址 2023-08-07 17:00:01 +08:00
648540858
4a34097b68 录像下载不使用固定地址 2023-08-04 16:41:29 +08:00
648540858
988dc36fa5 重构点播，回放，下载时ssrc不一致以及TCP主动播放的逻辑 2023-08-04 15:47:56 +08:00
648540858
095a3e1384 移除无用代码 2023-07-31 12:26:42 +08:00
648540858
59d8f2f915 支持录像回放使用固定流地址以及自动点播录像回放 2023-07-25 11:14:43 +08:00
wanghui
7fd34cfda5 feat:支持级联tcp主动 2023-07-24 15:57:11 +08:00
648540858
a39ac45bcc 扩展兼容接口，支持HTTPS接口 2023-07-20 17:18:11 +08:00
648540858
9cd63f0105 修复国标级联时添加目录不同平台无法使用同一个目录的问题 2023-07-19 15:33:21 +08:00
朱俊杰
4f2cd41134 修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突 2023-07-17 10:54:34 +08:00
648540858
4162706ec4 修复因为心跳重发导致的心跳间隔异常 2023-07-14 09:10:59 +08:00
che_shuai
c27e345edc 修复多级级联平台平台时，上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-GB28181-pro/issues/914 2023-07-13 10:22:42 +08:00
648540858
04e7f48fde 合并主线的发流端口管理逻辑 2023-07-10 14:30:59 +08:00
648540858
ff1e9f79c2 优化海康发送的Message消息设置的消息体长度为0，导致无法解析的问题 #920 2023-07-07 14:51:41 +08:00
648540858
e4754af417 修复数据错误导致无法转成JSON返回 #919 2023-07-06 15:35:59 +08:00
648540858
e163cf4d20 兼容海康平台在address字段使用错误的<或>破坏xml结构的情况， #903 2023-07-06 15:18:10 +08:00
648540858
457c5e3821 修复拉流代理无人观看自动停用失败 2023-07-04 11:10:17 +08:00
648540858
e4622d17a6 优化字段名称 2023-07-03 10:36:02 +08:00
648540858
b64f320805 优化发流逻辑 2023-07-01 18:10:33 +08:00
648540858
c916433042 优化更新通道中父结点的判断 2023-06-30 10:34:02 +08:00
648540858
18ad50222f 优化更新通道中父结点的判断 2023-06-30 10:01:21 +08:00
648540858
e8b766172e 合并268优化内容 2023-06-29 10:37:20 +08:00
648540858
f62bf7b2c6 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
 2023-06-29 09:52:05 +08:00
648540858
bfae9780f7 增加流关闭时的处理 2023-06-28 20:32:48 +08:00
648540858
def56793ba 增加上级推流和停止推流的通知 2023-06-28 16:52:27 +08:00
648540858
a77628e875 优化端口预占用，防止占用无法释放 2023-06-28 14:50:46 +08:00
648540858
724963324a 修复上级点播时如果推流信息中mediaServerID错误的情况 2023-06-26 19:06:14 +08:00
648540858
fec69c714c 优化国标信令 2023-06-25 22:40:26 +08:00
648540858
155838ce2e 优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 2023-06-22 22:35:35 +08:00
648540858
7b24d51db9 优化国标级联的端口保持 2023-06-21 14:03:31 +08:00
648540858
9e28923b8c
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-06-20 14:15:27 +08:00
648540858
d310204d00 去除多余字段 2023-06-20 09:57:28 +08:00
648540858
0532363192 优化国标级联注册机制 2023-06-20 09:29:12 +08:00