Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,526 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

1054 Commits (6fa5b37b962b05b3aa4b7bf019eb47c4cdbb5738)

Author SHA1 Message Date
648540858 0f0ece2401 设备编辑增加收流IP 2022-10-25 10:17:59 +08:00
648540858 958474c646 首页改造完成,添加系统信息 2022-10-24 18:14:31 +08:00
648540858 ca891f367c 首页改造完成,待添加系统信息 2022-10-24 15:20:35 +08:00
ljm d6fe626b1c 【zlm心跳hook】重复查询redis了 
变量也不需要多次定义
数据库有的话应该恢复zlm
缓存没有的话需要重新加载缓存
 2022-10-22 09:48:45 +08:00
648540858 3ffe205082 首页改造,完成cpu,内存,网络图 2022-10-20 18:03:40 +08:00
ljm 2bf7cdc2df 【zlm心跳hook】重复查询redis了 
变量也不需要多次定义
数据库有的话应该恢复zlm
 2022-10-20 16:04:47 +08:00
648540858 95d367702a 增加启动时清理redis中错误zlm数据 2022-10-19 16:25:38 +08:00
648540858 6dbc7a68bd 兼容设备通道信息中自己为自己父节点的情况 2022-10-19 11:20:23 +08:00
648540858 b25f3631ee 国标级联支持拉流代理自动拉起 2022-10-19 11:17:08 +08:00
648540858 b6bcb5f2f4 隐藏liveplayer 2022-10-19 10:28:51 +08:00
648540858 7bfa85424a 增加日志 2022-10-18 23:04:44 +08:00
648540858 84c60381cc 增加设备通道数为0时自动发起更新通道 2022-10-18 23:03:33 +08:00
648540858 f9ae4cfdbe 更新readme 2022-10-18 22:40:43 +08:00
648540858 1af77ab5f7
Merge pull request #645 from IKangXu/wvp-28181-2.0 
优化 国标设备中通道内查看的逻辑，保证与分屏与电子地图中树结构的数据一致
 2022-10-18 22:18:49 +08:00
648540858 c9fd7f940f 修复录像回放ssrc不一致无法播放的问题 2022-10-18 17:32:08 +08:00
648540858 3c52a16e5f 支持手动添加，为设备设置单独的密码 2022-10-18 17:02:05 +08:00
648540858 882e6a027e 去除多余引入 2022-10-18 14:37:33 +08:00
648540858 878dc33e6b 去除国标级联中ServerTransaction的使用 2022-10-18 14:30:39 +08:00
648540858 80d2edeef2 优化sip消息构建，去除ServerTransaction的使用 2022-10-18 13:07:38 +08:00
IKangXu 58b9dab89f 优化 分屏设备与电子地图中树结构展示信息 
优化 国标设备中通道内查看的逻辑，保证与分屏与电子地图中树结构的数据一致
 2022-10-18 09:27:12 +08:00
648540858 3e91483d4b 支持锁定编辑后的设备名 #642 2022-10-17 17:16:59 +08:00
648540858 f6320c7dd3 合并主线 2022-10-17 17:02:16 +08:00
648540858 82fd369ce5 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2022-10-17 16:56:13 +08:00
648540858 7918f03734 优化按需拉流配置，拉流代理支持按需拉流 2022-10-17 16:38:28 +08:00
648540858 1e1364e51a 修复开始点播功能接口调用返回参数与定义的不符 #635 2022-10-17 14:33:25 +08:00
648540858 2f11618199 修复用户删除失败，#636 2022-10-17 14:08:44 +08:00
648540858 6a2ff99515 合并主线 2022-10-17 12:47:02 +08:00
648540858 6bfd48776d Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-10-17 12:45:56 +08:00
648540858 0ff4ed217d 优化消息处理中存在可能异常的处理流程 2022-10-17 12:39:58 +08:00
648540858 c4fc4abf7c 优化代码空字符串判断 2022-10-17 09:39:21 +08:00
XiaoQiTong dabee4ed7d 增加指定流媒体收流功能 2022-10-15 20:57:24 +08:00
648540858 ad246bf921 去除ffmpeg模板配置 2022-10-14 23:11:47 +08:00
648540858 5bf1fe84ec 还原#640点播开始后的截图任务，判断启用https后使用https_fmp4流地址 2022-10-13 22:25:46 +08:00
duzeng a463b676e2 feat: 点播开始后的截图任务，判断启用https后使用https_fmp4流地址 
Signed-off-by: duzeng <duzengrass@163.com>
 2022-10-13 20:42:35 +08:00
jshqhxm c18dd55c74 去除 com.sun.javafx 无引用包，会导致在linux环境下编译不通过 2022-10-09 16:20:39 +08:00
648540858 a4f48a1522 修复回看控制失效 #619 2022-09-30 17:54:58 +08:00
648540858 e1af52fb5e 更新文档 2022-09-30 15:51:28 +08:00
648540858 06bbe3fe01 添加第二种语音对讲实现 2022-09-29 16:27:59 +08:00
648540858 ebe8667b13 Merge branch 'wvp-28181-2.0' 2022-09-26 15:40:31 +08:00
648540858 386b48192d 修复点播时viatag不规范的问题 2022-09-26 15:38:55 +08:00
648540858 6ae33f2a67 修复空指针 2022-09-26 14:01:22 +08:00
648540858 2ff3cdb6a1 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.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/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2022-09-26 11:25:53 +08:00
648540858 30979eb6ea
Merge pull request #627 from 648540858/wvp-dialog 
修复兼通api错误
 2022-09-26 10:41:04 +08:00
648540858 3fb9694c2d 修复兼通api错误 2022-09-26 10:40:20 +08:00
648540858 bf97908c5e
Merge pull request #626 from 648540858/wvp-dialog 
合并bug修复
 2022-09-26 10:38:48 +08:00
648540858 0cc5917d8a 修复通道更新 2022-09-26 10:14:31 +08:00
648540858 559fbf1258 添加缺失的打印信息 2022-09-26 10:02:26 +08:00
648540858 d7a1b94f90 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	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/ByeRequestProcessor.java
#	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/message/response/cmd/BroadcastResponseMessageHandler.java
 2022-09-24 21:04:58 +08:00
648540858 d176b5231b
Merge pull request #620 from xu-bin-bin/wvp-28181-2.0 
处理上级平台发送的invite请求不携带“y=”sdp信息时，使用默认“y=0000000000”视频无法播放的问题。
 2022-09-23 23:18:06 +08:00
648540858 4c6c77be7a 异常情况打印信息优化 2022-09-23 23:15:44 +08:00
648540858 cd117ed228 dialog去除以及异常情况处理优化 2022-09-23 23:15:39 +08:00
xubinbin fc7f1b3459 处理上级平台发送的invite请求不携带“y=”sdp信息时，使用默认“y=0000000000”视频无法播放的问题。 2022-09-23 10:55:42 +08:00
648540858 a574ff0944 修复使用队列导致的问题 2022-09-22 16:56:20 +08:00
648540858 70c20364af 修复流注销时移除流认证信息 2022-09-22 14:10:26 +08:00
648540858 1abfced3b4 修复点播后bye信息的发送 2022-09-22 11:32:01 +08:00
648540858 5e73874880 添加队列处理redis消息和sip消息，支持使用推流状态作为通道在线状态 2022-09-22 11:22:08 +08:00
648540858 710600db6f 优化sip消息，去除自动dialog创建 2022-09-21 18:18:37 +08:00
648540858 692f716788 优化点播时RtpServer为正常关闭的问题 2022-09-16 18:02:56 +08:00
648540858 ab74d1cff9 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
 2022-09-14 20:51:21 +08:00
648540858 5b3dc4d595 优化点播结束后关闭RTPServer 2022-09-14 16:11:18 +08:00
648540858 250a059ca0 优化目录发送 2022-09-13 14:53:41 +08:00
648540858 243edbd143 为User-Agent添加必要的版本信息 2022-09-09 23:19:19 +08:00
648540858 221f99c764 优化sip消息 2022-09-09 17:06:19 +08:00
648540858 b5fb82934e 修复发送目录信息是状态错误 2022-09-08 21:22:49 +08:00
648540858 bd5b9ca1f7 获取实际内容长度，不使用header中的长度信息 2022-09-08 20:20:43 +08:00
648540858 feb9996538 修复添加业务分组失败 2022-09-08 17:51:12 +08:00
648540858 394c40d8bb 修复目录订阅的状态异常 2022-09-08 16:42:46 +08:00
648540858 4bda14b098 修复cseq序号回退 2022-09-08 15:27:47 +08:00
648540858 a6f9c090cb 重启服务时上级平台直接注销再注册 2022-09-08 10:50:44 +08:00
648540858 2f76fa98bb Merge branch '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/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2022-09-08 09:46:35 +08:00
648540858 6a5ab117f5 修复推流列表状态过滤 2022-09-08 09:21:11 +08:00
648540858 f1c7d612ca
Merge pull request #590 from ixingqiao/wvp-28181-2.0 
1.解决轮询内存增长过快问题
 2022-09-08 09:19:57 +08:00
648540858 60c4f767f0 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-09-07 16:18:52 +08:00
648540858 ec0ec5eb54 修复并发点播时可能出现的rtpServer开启但是还未收到流的情况，编码类型136，137,138默认开启音频通道 2022-09-07 16:18:35 +08:00
jiang 3884e9a56a 1.根据redis消息更新推流列表时同时更新在线状态 
2.推流列表的模板增加在线状态
 2022-09-07 15:56:48 +08:00
648540858 e7bdcc1f8d 修复选择通道时默认节点显示错误的问题 2022-09-06 16:31:28 +08:00
648540858 d5e8aa62a1 添加对海康平台录像回放的兼容，修复录像信息发送失败, 级联平台支持开启rtcp保活 2022-09-05 17:10:21 +08:00
648540858 aa6bce35c7 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
 2022-09-05 09:44:24 +08:00
648540858 cfe9c762d6 修复前端播放 2022-09-05 09:40:14 +08:00
648540858 0134488428 优化推流列表查询 2022-09-02 17:00:41 +08:00
648540858 ee7ef0bf41 优化级联平台注册的周期时间 2022-09-02 15:49:40 +08:00
648540858 7db2bf7b51 使用equalsIgnoreCase代替equals,忽略大小写差异 2022-09-02 10:51:55 +08:00
648540858 b46e5efad2 测试sip消息预处理 2022-09-01 22:27:18 +08:00
648540858 3146e63fc0 优化异常处理 2022-09-01 17:53:00 +08:00
648540858 03d6ad289b Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	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/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
 2022-09-01 14:50:28 +08:00
648540858 703c2e292a 云端录像详情页添加返回按钮 2022-08-31 18:07:53 +08:00
648540858 275b272160 hook订阅曾增加过期清除功能，防止内存溢出 2022-08-31 13:09:45 +08:00
648540858 2de4c322f6 去除对redis key过期事件的使用；重构国标级联的注册保活 2022-08-31 11:29:13 +08:00
648540858 d47902bdca 启动时redis未连接导致无法启动 2022-08-29 14:39:18 +08:00
648540858 9e2630ee32 增加zlm心跳超时的判定时间 2022-08-29 14:04:54 +08:00
648540858 6e90050db4 去除zlm使用redis过期作为心跳超时的方式 2022-08-29 11:50:36 +08:00
648540858 8b6449ce3a 升级版本号 2022-08-29 09:55:09 +08:00
648540858 9f680a2e9e 修复bug以及日志按照，错误/sip/数据库 分割 2022-08-26 18:03:09 +08:00
xingqiao 3c025a5ac0 1.解决轮询内存增长过快问题 2022-08-26 11:03:43 +08:00
648540858 8f7e8efc98 合并主线 2022-08-23 11:48:31 +08:00
648540858 020f9ea8a0 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
 2022-08-23 11:01:53 +08:00
648540858 942c5caa7c Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-08-23 11:00:57 +08:00
648540858 f24b6fa13f 优化国标录像的异常判断 2022-08-23 11:00:46 +08:00
648540858 c0e5478a84 Merge branch 'wvp-28181-2.0' 2022-08-23 08:45:38 +08:00
648540858 89a2e62702 Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 2022-08-22 23:01:52 +08:00