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

1922 Commits (3571ca272b5c4d0b9df0d3e2c99f0384ba203797)

Author SHA1 Message Date
648540858 a4328e3d4f 修复关闭接口鉴权后跨域设置失效的问题 2023-03-23 08:52:35 +08:00
648540858 663f394177 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-03-22 15:21:58 +08:00
648540858 f210952ed2 优化国标级联中的通道全部导入 2023-03-22 15:21:22 +08:00
xiaoQQya de969b7760 fix(snap): 修复 rtsp 端口为空时使用 mp4 协议截图失败的问题 2023-03-22 15:21:22 +08:00
648540858 c85c994972 修复设备点播时指定流媒体 2023-03-22 15:21:22 +08:00
648540858 66234dc288 优化点播后截图以及截图的展示 2023-03-22 15:21:22 +08:00
xiaoQQya df9f6a8927 perf(streamInfo): 优化点播接口返回流信息中的 RTMP/RTSP/RTC 链接 2023-03-22 15:21:22 +08:00
xiaoQQya 713aa00acc perf(snap): 优化点播成功后截图使用 rtsp 流, 新增对 H265 编码视频截图的支持 2023-03-22 15:21:22 +08:00
xiaoQQya 219f863191 fix(国标设备): 修复设备列表云台类型不显示的问题 2023-03-22 15:21:22 +08:00
xiaoQQya aac3e95159 perf(jessibuca): 优化 videoInfo 重复 log 的问题 2023-03-22 15:21:22 +08:00
逐浪人 3fd60f8676 Update UserController.java 
修复修改密码报错，传递id参数为0的bug
 2023-03-22 15:21:22 +08:00
648540858 0f3f3c077b 修复添加zlm节点使用默认值的问题 #781 2023-03-22 15:21:22 +08:00
648540858 bc7cc73d52 修复可空时间参数的校验 #784 2023-03-22 15:21:22 +08:00
648540858 b444585ebe 优化国标级联中的通道全部导入 2023-03-22 15:20:48 +08:00
648540858 c73fe2b0cf
Merge pull request #787 from xiaoQQya/wvp-28181-2.0 
修复 RTSP 端口为空时使用 MP4 协议截图失败的问题
 2023-03-22 10:45:36 +08:00
xiaoQQya 3ef643d658 fix(snap): 修复 rtsp 端口为空时使用 mp4 协议截图失败的问题 2023-03-22 10:36:06 +08:00
648540858 3ae0878ec2 修复设备点播时指定流媒体 2023-03-22 10:31:45 +08:00
648540858 dbb4a20602 优化点播后截图以及截图的展示 2023-03-22 09:52:23 +08:00
648540858 ed08c7ef77
Merge pull request #785 from xiaoQQya/wvp-28181-2.0 
新增对 H265 编码视频截图的支持
 2023-03-22 09:27:17 +08:00
648540858 8773864b5b
Merge pull request #786 from zhulangren/wvp-28181-2.0 
Update UserController.java
 2023-03-22 09:15:51 +08:00
逐浪人 ccbef9b533
Update UserController.java 
修复修改密码报错，传递id参数为0的bug
 2023-03-21 19:39:54 +08:00
648540858 2c3f6417a3 修复添加zlm节点使用默认值的问题 #781 2023-03-21 17:55:44 +08:00
648540858 4172e6c64b 修复可空时间参数的校验 #784 2023-03-21 17:43:33 +08:00
648540858 3e4d2b682c
Merge pull request #783 from StreamLuna/wvp-28181-2.0 
fix: 根据国标设备编号查询设备没有返回通道数
 2023-03-21 17:23:38 +08:00
648540858 82adc0cb23 完善语音对讲级联 2023-03-21 15:55:24 +08:00
648540858 4eac6dcc94 修复启动偶现报错 2023-03-21 14:22:40 +08:00
648540858 455e58f866 优化合并对讲broadcast级联模式 2023-03-21 14:21:45 +08:00
648540858 6b1d966255 优化合并对讲broadcast级联模式 2023-03-21 10:27:07 +08:00
648540858 4362a5b499 主线合并对讲broadcast级联模式 2023-03-20 15:42:59 +08:00
648540858 26bdf2e776 Merge branch '级联' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/dialog/devicePlayer.vue
 2023-03-20 15:31:43 +08:00
xiaoQQya fe9965bc63 perf(streamInfo): 优化点播接口返回流信息中的 RTMP/RTSP/RTC 链接 2023-03-20 14:56:46 +08:00
xiaoQQya 0772f69885 perf(snap): 优化点播成功后截图使用 rtsp 流, 新增对 H265 编码视频截图的支持 2023-03-20 14:54:17 +08:00
648540858 b3c4636520 主线合并talk模式 2023-03-20 14:40:17 +08:00
648540858 039fbf7e24 Merge branch 'talk' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.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/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2023-03-20 14:32:53 +08:00
648540858 a000ed6062 完善talk模式 2023-03-20 14:20:28 +08:00
xiaoQQya 7bfaaf8838 fix(国标设备): 修复设备列表云台类型不显示的问题 2023-03-20 13:22:01 +08:00
xiaoQQya b5efaa7baa perf(jessibuca): 优化 videoInfo 重复 log 的问题 2023-03-20 13:21:22 +08:00
StreamLuna eb173b1b24 fix: 根据国标设备编号查询设备没有返回通道数 2023-03-20 10:58:44 +08:00
648540858 ebe24a6c32 优化redis连接 2023-03-20 10:05:00 +08:00
648540858 782300452c 优化对海康平台的兼容性 2023-03-17 17:08:37 +08:00
648540858 d3027b0668 优化消息通道 2023-03-17 15:14:00 +08:00
648540858 22a205e8fc 优化异常处理 2023-03-17 14:02:16 +08:00
648540858 c3ce2bc5d0 优化异常处理以及级联设备状态查询 2023-03-17 13:22:05 +08:00
648540858 72b9239c5a 优化消息通道 2023-03-16 20:32:22 +08:00
648540858 eec4e347d7 优化端口保持 2023-03-16 20:19:00 +08:00
648540858 85c5fafda5 更新前后端分离部署文档 2023-03-16 09:34:20 +08:00
648540858 5cd3e0e919 更新前后端分离部署文档 2023-03-16 09:32:21 +08:00
648540858 71cf9852ec 更新前后端分离部署文档 2023-03-16 09:18:27 +08:00
648540858 bb3f219a61 国标级联回复目录数据中添加云台类型 2023-03-15 23:28:22 +08:00
648540858 2bf07305aa Merge branch 'wvp-28181-2.0' into wvp-jwt-token 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/resources/all-application.yml
 2023-03-15 22:58:28 +08:00