Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,907 Commits 2 Branches 0 Tags 42 MiB
19f7dc21a1
Commit Graph

1321 Commits

Author SHA1 Message Date
648540858
7b33a790a8 Merge pull request #957 from orcfnjmlns908/wvp-28181-2.0 
优化拉流代理保存
 2023-07-20 13:00:02 +08:00
648540858
f8908474b3 修复civilCode判断错误导致civilCode丢失 2023-07-19 20:48:15 +08:00
648540858
a0a4fdb032 修复国标级联时添加目录不同平台无法使用同一个目录的问题 2023-07-19 15:33:21 +08:00
tonyjianhua
99221a34c3 优化拉流代理保存 2023-07-19 13:33:53 +08:00
648540858
1d5320836f 合并分支功能 2023-07-17 17:28:49 +08:00
648540858
84ea0d313f Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-07-17 16:56:58 +08:00
648540858
0d1abf5580 优化发流端口分配 2023-07-17 16:55:41 +08:00
648540858
02bc1c393d 优化日志 2023-07-17 16:54:00 +08:00
xiaoQQya
f707dee47d perf(config): 补全 all-application.yml 配置文件 2023-07-17 15:51:09 +08:00
648540858
6fddd1d34a Merge pull request #939 from xiaoQQya/wvp-28181-2.0 
修复设备通道列表按通道类型筛选不准确等问题
 2023-07-17 15:44:10 +08:00
朱俊杰
5ee2d26ed1 修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突 2023-07-17 10:54:34 +08:00
648540858
a9bd11b9d4 优化拉流代理的添加 2023-07-14 19:46:41 +08:00
648540858
60007bb552 推流默认开启音频 2023-07-14 11:27:58 +08:00
648540858
c5ebd79093 修复因为心跳重发导致的心跳间隔异常 2023-07-14 09:10:59 +08:00
648540858
77cebecd45 修复数据存储 2023-07-14 08:34:15 +08:00
648540858
f7d6ec1332 修复合并错误 2023-07-13 14:57:30 +08:00
648540858
e6d9d65e51 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
 2023-07-13 14:47:24 +08:00
648540858
c6cc5209c0 增加发流音视频分开发送 2023-07-13 14:30:41 +08:00
che_shuai
e94ffbdd5f 修复多级级联平台平台时，上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-GB28181-pro/issues/914 2023-07-13 10:22:42 +08:00
648540858
f167a9c9e8 修复发流复盖的为问题 2023-07-12 15:13:53 +08:00
648540858
d10d7ab89c 合并主线的发流端口管理逻辑 2023-07-10 14:30:59 +08:00
xiaoQQya
44680ebe63 fix(play): 修复作为上级平台点播截取快照问题 2023-07-09 20:22:40 +08:00
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
bb87550cdc Merge pull request #908 from cnless/wvp-28181-2.0 
fix:修复ResponseBody未关闭以及点播超时报错AsyncRequestTimeoutException
 2023-07-01 23:04:39 +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
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
0325efd84c 恢复默认值 2023-06-20 14:17:44 +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
648540858
5c631d8039 去除多余字段 2023-06-20 09:57:28 +08:00
648540858
3e45526474 优化国标级联注册机制 2023-06-20 09:29:12 +08:00
648540858
16256537fb Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
#	src/main/resources/all-application.yml
#	web_src/package-lock.json
 2023-06-19 20:19:31 +08:00
648540858
c64fb0d3db 优化国标级联注册机制 2023-06-19 20:09:16 +08:00
648540858
eeb345fa93 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范 2023-06-19 18:42:36 +08:00
‘sxh’
5d6b8c1804 同步主线的代码，保持一致性 2023-06-15 11:20:43 +08:00
‘sxh’
ed6aaa25b9 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2023-06-15 11:10:20 +08:00
‘sxh’
7e70ad4849 新增设备主子码流选择，默认为不开启 2023-06-15 11:00:29 +08:00
648540858
d9506b9e59 优化移动位置的时间 2023-06-14 20:39:10 +08:00
648540858
ef5440a97f Merge pull request #876 from criver31/wvp-28181-2.0 
移动设备实时位置兼容ISO8601格式
 2023-06-14 20:14:31 +08:00
648540858
b4f0d17f9f 修复前端空指针异常 #831 2023-06-14 18:14:40 +08:00
648540858
db1d503c55 修复移动位置获取接口超时 #857 2023-06-14 17:04:41 +08:00
648540858
7f22b5e504 修复级联录像查询sql错误 2023-06-14 16:26:29 +08:00
648540858
dcde54d8cd 去除多余日志 2023-06-13 23:11:56 +08:00
648540858
1fcb946700 Merge branch '2.6.8' into wvp-28181-2.0 2023-06-13 23:11:00 +08:00
648540858
5f2d4393c3 修复zlm上线时过期任务设置错误 2023-06-13 23:06:35 +08:00
648540858
97bd082a40 修复sdp解析错误 2023-06-12 22:54:40 +08:00
648540858
4ed7cb49be 优化sdp解析，兼容带有f=的设备 2023-06-10 00:32:42 +08:00
648540858
4815af8ca0 修复stream-on-demand配置失效的BUG 2023-06-08 22:46:07 +08:00
648540858
4d8cf32fbc Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
 2023-06-08 10:41:36 +08:00
648540858
508b3aa44f 优化ffmpeg拉流代理 2023-06-08 10:40:16 +08:00
648540858
0b8584243f 优化via的branch生成规则 2023-06-07 21:45:15 +08:00
648540858
3d2f34e736 增加收到notify增加或移除通道时发送redis消息 2023-06-07 21:11:39 +08:00
648540858
3a2468eef5 支持redis消息强制关闭流 2023-06-07 20:58:35 +08:00
648540858
e196e012de 合并分支 2023-06-07 20:27:57 +08:00
648540858
96f8bded6e Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
 2023-06-07 20:21:10 +08:00
648540858
e7402c9488 修复录像下载，优化拉流代理接口 2023-06-07 20:15:08 +08:00
648540858
730779ba86 优化截图获取接口 2023-06-05 11:10:15 +08:00
648540858
8e014cce07 修复拉流代理的ffmpeg代理方式 2023-06-05 10:28:11 +08:00
648540858
3c1528b168 修复添加目录SQL错误 #881 2023-06-05 09:39:59 +08:00
648540858
6a24603fd3 优化日志 2023-06-02 16:40:19 +08:00
648540858
75bb0ec40a 优化点播流程中ssrc的释放 2023-06-02 15:46:07 +08:00
648540858
b840b94bd2 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-06-01 15:58:33 +08:00
yanggs
5acd9af03d 修复 启用代理失败： ->缺少必要参数:"src_url","dst_url","timeout_ms" 2023-06-01 13:30:48 +08:00
fine
9a6bedf576 Update MobilePositionResponseMessageHandler.java 2023-05-31 09:35:08 +08:00
648540858
0333d83b6c 去除多余配置 2023-05-30 11:20:22 +08:00