648540858
|
f9abfca003
|
临时提交
|
2024-04-15 21:33:22 +08:00 |
|
648540858
|
bd0fafde81
|
修复目录订阅发送订阅未携带经纬度的问题
|
2024-04-15 15:51:10 +08:00 |
|
648540858
|
48351c875e
|
国标级联支持制定200OK中sdp的IP
|
2024-04-08 18:13:15 +08:00 |
|
648540858
|
7d53009987
|
优化推流通知
|
2024-04-07 20:06:48 +08:00 |
|
648540858
|
1de344674a
|
使用冒号分隔redis的key
|
2024-03-28 18:08:33 +08:00 |
|
648540858
|
f1e902af7f
|
支持级联移动位置订阅通知转发
|
2024-03-28 16:28:41 +08:00 |
|
648540858
|
e886aa4833
|
修复PTZType导致声音开关失效的问题
|
2024-03-27 11:15:35 +08:00 |
|
648540858
|
3291c4b2e6
|
修复多平台推流无人观看redis通知
|
2024-03-21 16:54:44 +08:00 |
|
648540858
|
912c83dfd3
|
添加日志
|
2024-03-21 11:16:31 +08:00 |
|
648540858
|
97dc926b28
|
调整ptzType字段名称
|
2024-03-18 17:41:49 +08:00 |
|
648540858
|
045f2334d0
|
修复级联查看国标录像
|
2024-03-15 15:15:20 +08:00 |
|
648540858
|
d4f6ec39b7
|
优化CivilCode缓存
|
2024-03-14 14:54:20 +08:00 |
|
648540858
|
e1c8183adf
|
调整语音对讲超时任务位置
|
2024-03-14 11:03:52 +08:00 |
|
648540858
|
cb5afce55e
|
优化语音对讲定时任务的删除
|
2024-03-12 23:55:00 +08:00 |
|
648540858
|
1fcdf5a8f3
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
|
2024-03-08 09:30:48 +08:00 |
|
648540858
|
d8b24fc795
|
XmlUtil添加直接获取Double和Integer的方法
|
2024-03-07 14:49:46 +08:00 |
|
648540858
|
5bf87ca330
|
Merge pull request #1270 from hexq/playback
Playback
|
2024-03-05 10:41:22 +08:00 |
|
648540858
|
66210ec51a
|
支持国标级联语音喊话TCP主动模式
|
2024-02-27 17:41:14 +08:00 |
|
648540858
|
509d9b3cbb
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
|
2024-02-27 10:22:13 +08:00 |
|
648540858
|
5f09692198
|
添加统一回调管理
|
2024-02-23 18:48:01 +08:00 |
|
648540858
|
f6c48588da
|
支持支持主码流子码流切换
|
2024-02-22 17:22:28 +08:00 |
|
648540858
|
18898e982f
|
支持读取warning header作为错误消息的内容 #1030
|
2024-02-20 15:08:06 +08:00 |
|
648540858
|
a9ab5c28e9
|
优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273
|
2024-02-20 11:12:42 +08:00 |
|
648540858
|
e5856a9f91
|
修复ack超时事件异常执行的bug
|
2024-02-07 21:18:36 +08:00 |
|
648540858
|
f2f70fce98
|
修复合并错误
|
2024-02-07 20:53:13 +08:00 |
|
648540858
|
562dbb0857
|
Merge remote-tracking branch 'origin/main-dev' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2024-02-07 20:37:23 +08:00 |
|
648540858
|
2e7c9a7341
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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/media/zlm/AssistRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# src/main/resources/all-application.yml
# src/main/resources/application-dev.yml
|
2024-02-07 20:30:37 +08:00 |
|
648540858
|
b079039f81
|
修复国标级联上级主动结束时ssrc未释放的问题
|
2024-02-02 09:20:13 +08:00 |
|
648540858
|
fc74ce9de4
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/resources/application-dev.yml
|
2024-01-31 17:25:32 +08:00 |
|
648540858
|
ab34cb37f3
|
修复空指针异常
|
2024-01-29 21:20:03 +08:00 |
|
648540858
|
695f9b7f4d
|
修复来自其他wvp的推流时平台名称未赋值的问题
|
2024-01-29 19:31:07 +08:00 |
|
pedoc
|
3d68b56bb5
|
修复未配置sipdomain时出现异常
|
2024-01-29 18:05:17 +08:00 |
|
648540858
|
5a3b1c04d6
|
补充日志
|
2024-01-22 12:09:04 +08:00 |
|
648540858
|
46af350868
|
优化多节点国标级联国标录像查询
|
2024-01-21 22:38:50 +08:00 |
|
648540858
|
31df0fb3ff
|
修复级联点播时tcp模式信令回复的错误
|
2024-01-21 16:56:13 +08:00 |
|
hexq
|
7055c53192
|
BUGFIX：回放时，优先从SDP中提取channelId，兼容从Subject无法提取到channelId的问题
|
2024-01-20 10:26:49 +08:00 |
|
648540858
|
782e8b9800
|
修复sendRtpItem写入不及时导致的发流失败
|
2024-01-19 15:43:08 +08:00 |
|
648540858
|
ebc65b40d3
|
添加收到invite消息后的日志，减少国标级联推送代理流的等待时间
|
2024-01-18 14:54:03 +08:00 |
|
648540858
|
7f79b92568
|
修复设备在事务内注销失败的问题
|
2024-01-18 10:17:03 +08:00 |
|
648540858
|
88721511e7
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-16 14:51:17 +08:00 |
|
648540858
|
9a96597e66
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
|
2024-01-16 14:10:27 +08:00 |
|
648540858
|
13e2a96dae
|
添加删除通道时通知的日志
|
2024-01-15 15:39:28 +08:00 |
|
648540858
|
0371f5a96e
|
修复国标级联全部添加与全部删除
|
2024-01-15 15:31:20 +08:00 |
|
648540858
|
e5a9dd24ef
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-12 14:17:01 +08:00 |
|
648540858
|
2b2efb59a6
|
修复多个推流推送到上级是不完整的问题，修改平台注销时不删除自己模拟的订阅信息
|
2024-01-11 14:56:11 +08:00 |
|
648540858
|
64be28ed77
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-10 16:17:53 +08:00 |
|
648540858
|
c25a99d60b
|
修复空指针异常
|
2024-01-10 16:17:29 +08:00 |
|
648540858
|
0c10c77a56
|
优化录像路径的设置
|
2024-01-10 11:14:49 +08:00 |
|
648540858
|
b15e559eae
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-08 16:18:28 +08:00 |
|
648540858
|
a74fb6ecd6
|
优化目录订阅处理，保证存储异常时不影响后续操作
|
2024-01-08 15:03:07 +08:00 |
|