Commit Graph

1923 Commits

Author SHA1 Message Date
648540858
4946c83675 优化第三方对接接口 2023-07-07 18:17:24 +08:00
648540858
70933aef8c 优化海康发送的Message消息设置的消息体长度为0,导致无法解析的问题 #920 2023-07-07 14:51:41 +08:00
648540858
ee1a823cb6 优化海康发送长度与实际长度不一致的情况,导致无法识别消息内容的问题 2023-07-06 18:01:16 +08:00
648540858
29f2abb3a4 修复BUG #928 2023-07-06 15:55:58 +08:00
648540858
400a71b18e 修复数据错误导致无法转成JSON返回 #919 2023-07-06 15:35:59 +08:00
648540858
47221e73a5 兼容海康平台在address字段使用错误的<或>破坏xml结构的情况, #903 2023-07-06 15:18:10 +08:00
648540858
5d83a431bd Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
2023-07-06 15:07:43 +08:00
648540858
0ced2a8b2d 修复非必传参数 2023-07-06 15:07:16 +08:00
648540858
b5133f66c5 添加兼容目录同步兼容性 2023-07-05 17:20:20 +08:00
648540858
08372e5ede 修复拉流代理无人观看自动停用失败 2023-07-04 11:10:17 +08:00
648540858
36c2e23ef4 修复单端口点播 2023-07-03 17:55:34 +08:00
648540858
663858a9d1 Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
2023-07-03 16:54:09 +08:00
648540858
090d5b8b62 增加与第三方对接的接口 2023-07-03 16:53:03 +08:00
648540858
1bd68d1373 优化字段名称 2023-07-03 10:36:02 +08:00
648540858
b5ff247a82 增加备用字段 2023-07-02 12:40:41 +08:00
648540858
cb3c221b69 增加备用字段 2023-07-02 00:03:21 +08:00
648540858
bb87550cdc Merge pull request #908 from cnless/wvp-28181-2.0
fix:修复ResponseBody未关闭以及点播超时报错AsyncRequestTimeoutException
2023-07-01 23:04:39 +08:00
648540858
d10ea890fa 修复添加拉流代理提交错误 2023-07-01 22:50:24 +08:00
648540858
780fd24c9c 修复打开分享页需要登陆的BUG 2023-07-01 22:14:53 +08:00
648540858
e9c019a28c 优化发流逻辑 2023-07-01 18:10:33 +08:00
648540858
fe1f73a1c1 优化更新通道中父结点的判断 2023-06-30 10:34:02 +08:00
648540858
dc957d3104 优化更新通道中父结点的判断 2023-06-30 10:01:21 +08:00
648540858
bb4d5b895b 优化更新通道的civicode判断 2023-06-29 17:10:14 +08:00
648540858
d2c4050454 修复使用推流状态作为推流通道状态为false仍然发送通知 2023-06-29 11:22:32 +08:00
648540858
a3af529d04 修复未验证通过的表单被应该提交 2023-06-29 11:09:41 +08:00
648540858
916b274958 合并268优化内容 2023-06-29 10:37:20 +08:00
648540858
de2452833d 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
ee59539530 优化树形列表通道查询 2023-06-29 09:36:13 +08:00
648540858
f96973501c 增加流关闭时的处理 2023-06-28 20:32:48 +08:00
648540858
2b795b1d19 增加上级推流和停止推流的通知 2023-06-28 16:52:27 +08:00
648540858
74c79a12db 修复树形列表通道查询 2023-06-28 15:02:59 +08:00
648540858
1cb62ba3fc 优化端口预占用,防止占用无法释放 2023-06-28 14:50:46 +08:00
648540858
a302a185f1 添加关闭收流发流的接口 2023-06-28 10:47:33 +08:00
648540858
fd4964a118 doc去除cdn依赖 2023-06-28 09:15:07 +08:00
648540858
25fa219be0 增加redis通道 2023-06-27 15:34:38 +08:00
648540858
b23d4b984e 修复上级点播时如果推流信息中mediaServerID错误的情况 2023-06-26 19:06:14 +08:00
648540858
f2001904f8 优化国标信令 2023-06-25 22:40:26 +08:00
dsk
31515d2f7b 新增接口超时时间配置,修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException 2023-06-25 16:16:40 +08:00
dsk
0d7789f2a6 修复请求报错404等情况下导致ResponseBody未关闭的问题 2023-06-25 16:00:37 +08:00
648540858
b9db7c15a6 优化自动获取stream ip 2023-06-25 13:49:07 +08:00
648540858
3691d6ff97 优化子码流切换逻辑,去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 2023-06-22 22:35:35 +08:00
648540858
312775fb27 修复表名错误 #904 2023-06-21 15:53:26 +08:00
648540858
4fd26db2a1 优化国标级联的端口保持 2023-06-21 14:03:31 +08:00
648540858
94ace01c42 添加文档依赖,去除cdn依赖 2023-06-20 15:25:56 +08:00
648540858
b0094a5755 添加sql字段 2023-06-20 14:25:01 +08:00
648540858
0325efd84c 恢复默认值 2023-06-20 14:17:44 +08:00
648540858
2546748867 Merge pull request #893 from sxh-netizen/wvp-28181-2.0
新增设备主子码流开关选择,默认为不开启
2023-06-20 14:16:46 +08:00
648540858
eef26ec736 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-06-20 14:15:27 +08:00
648540858
f3b44a97f5 修复删除的设备无法重新注册的问题 2023-06-20 13:02:18 +08:00
648540858
f96f575d65 修复通道刷新 2023-06-20 12:51:06 +08:00