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,401 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

407 Commits (06bbe3fe01e5af9486c309693a975077df813f7c)

Author SHA1 Message Date
648540858 06bbe3fe01 添加第二种语音对讲实现 2022-09-29 16:27:59 +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 710600db6f 优化sip消息，去除自动dialog创建 2022-09-21 18:18:37 +08:00
648540858 1ee56d50d8 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-09-16 18:04:13 +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
wenyanjun 12571e0db1 修复下载录像失败问题 2022-09-14 14:32:22 +08:00
648540858 221f99c764 优化sip消息 2022-09-09 17:06:19 +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
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 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 2de4c322f6 去除对redis key过期事件的使用；重构国标级联的注册保活 2022-08-31 11:29:13 +08:00
648540858 9f680a2e9e 修复bug以及日志按照，错误/sip/数据库 分割 2022-08-26 18:03:09 +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 f24b6fa13f 优化国标录像的异常判断 2022-08-23 11:00:46 +08:00
648540858 ecf4fbb684 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/Login.vue
 2022-08-22 16:53:16 +08:00
648540858 042b28b2d6 支持全局异常和统一返回结果 2022-08-22 16:17:28 +08:00
648540858 5461b8ebf2 支持全局异常和统一返回结果，未完待续 2022-08-22 16:17:28 +08:00
648540858 116d979d87 合并主线 2022-08-09 16:58:31 +08:00
648540858 8b0ff3767b Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	sql/update.sql
#	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/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-08-09 14:41:21 +08:00
zouyaoji 3b5a37c270 前端显示媒体服务器配置时报错修复 2022-08-06 11:27:02 +08:00
648540858 3adc81764c 优化用户表单 2022-08-05 17:27:18 +08:00
648540858 d94ceb4fed 去除点播界面双loading 2022-08-05 17:20:26 +08:00
648540858 231582eb77 推流列表增加经纬度的添加 2022-08-05 17:10:53 +08:00
jiang d09d8f11f0 修改‘修改pushkey’窗口的标题提示文案 2022-08-04 17:01:31 +08:00
mrjackwang f93a0d599e
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-08-02 15:32:15 +08:00
648540858 5e4a673ecc 修复视频播放点击音量报错 #557，修复编解码信息获取失败 2022-08-01 14:33:51 +08:00
648540858 2a5c12746b 修复首页未获取到zlm消息时发送错误消息的bug 2022-08-01 09:32:39 +08:00
mrjackwang a59095db0c
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-07-29 15:16:39 +08:00
648540858 b957ab61c7 bug修复 2022-07-26 11:43:56 +08:00
648540858 c77c1a956c 修复推流推流状态提示 2022-07-25 11:17:46 +08:00
648540858 91dc4566a2 修复级联无通道时更新停止在等待更新的问题 2022-07-25 09:44:43 +08:00
648540858 e29d94c83f 增加推流添加功能，修复级联目录推送 2022-07-22 16:02:14 +08:00
mrjackwang 8d87741dea
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-07-20 13:51:30 +08:00
jiang a51b411101 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-07-19 18:13:42 +08:00
jiang fc0ad32f81 1.修复新增用户没有pushkey的问题 
2.将重置pushkey改为修改pushkey
 2022-07-19 18:13:19 +08:00
648540858 9e397ba9f6 移除共享所有直播流功能 2022-07-19 17:46:16 +08:00
648540858 7f5a18d6b5 优化推流列表 2022-07-19 16:37:34 +08:00
648540858 4a43d04020 修复推流导入模板 2022-07-19 15:27:33 +08:00
648540858 03864ae46f 修复用户查询sql错误 2022-07-19 11:13:46 +08:00
jiang 1002150b2a Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-07-18 17:15:33 +08:00
jiang c6fbd03276 增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey 2022-07-18 17:09:35 +08:00
648540858 4451994959 优化国标级联目录订阅通知以及目录查询回复 2022-07-17 23:17:36 +08:00