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 |
|
648540858
|
be6666db03
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-03-15 22:57:20 +08:00 |
|
648540858
|
efbc3a31c0
|
支持登录返回值中携带token
|
2023-03-15 22:56:47 +08:00 |
|
648540858
|
5fab97cf7e
|
支持不同域的前后端分离部署
|
2023-03-15 19:05:56 +08:00 |
|
648540858
|
8c2b1ef4fe
|
修复拉流代理 下线时状态未更改为下线 #770
|
2023-03-14 18:46:01 +08:00 |
|
648540858
|
08c2fa45f7
|
Merge pull request #771 from mrjackwang/wvp-28181-2.0
修复历史录像下载问题，查询历史录像问题
|
2023-03-14 16:56:13 +08:00 |
|
648540858
|
bea5b40bf5
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2023-03-14 16:56:05 +08:00 |
|
648540858
|
e3be796314
|
Merge pull request #778 from xiaoQQya/wvp-28181-2.0
升级 jessibuca 版本，优化 jessibuca 播放配置
|
2023-03-14 16:49:54 +08:00 |
|
648540858
|
943f95ba8c
|
增加消息通道配置，可以通道redis在wvp上下级之间发送消息
|
2023-03-14 14:02:33 +08:00 |
|
xiaoQQya
|
84595e0c84
|
perf(jessibuca): 升级 jessibuca 2023-03-8 v3.1.28 版本, 修改 jessibuca 参数使用硬解码优化播放黑屏问题, https 环境下使用 WCS 硬解码, http 环境下使用 MSE 硬解码, H265 视频自动使用 wasm 软解码
|
2023-03-13 17:53:50 +08:00 |
|
xiaoQQya
|
bdcd006a7e
|
fix(jessibuca): 修复 jessibuca 组件截图报错的问题
|
2023-03-13 17:42:39 +08:00 |
|
648540858
|
292c36f1c1
|
Merge pull request #774 from gaoxun1937/wvp-28181-2.0
防止查询录像回放记录为空时的空指针错误
|
2023-03-13 17:30:33 +08:00 |
|
648540858
|
95688e400b
|
初步实现登录返回token
|
2023-03-13 09:45:00 +08:00 |
gaoxun250@sina.com
|
273b282af6
|
防止回放空时报空指针
|
2023-03-10 10:33:48 +08:00 |
wangyimeng
|
14c4a3c7e8
|
优化历史录像下载，目前已测试大华国标级联下载
|
2023-03-09 10:22:49 +08:00 |
|
648540858
|
ec90519c90
|
添加设备离线原因
|
2023-03-08 16:57:07 +08:00 |
|
648540858
|
b16923d175
|
优化报警时间
|
2023-03-08 15:50:11 +08:00 |
|
648540858
|
cefdce5e0a
|
优化兼容接口
|
2023-03-08 14:46:18 +08:00 |
|
648540858
|
c5ff811378
|
优化兼容接口
|
2023-03-08 13:28:54 +08:00 |
|
648540858
|
048a6ce072
|
优化报警时间
|
2023-03-08 11:42:28 +08:00 |
|
648540858
|
a7c3cf5316
|
优化跨域配置，支持同域的前后端分离部署
|
2023-03-05 09:53:26 +08:00 |
mrjackwang
|
8acd64eac6
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2023-03-04 21:37:39 +08:00 |
|
wangyimeng
|
2177e9dbf9
|
修复查询历史录像无记录时报错问题
|
2023-03-04 20:55:48 +08:00 |
|
wangyimeng
|
c662a53098
|
请求历史媒体下载增加回复事件处理ssrc与下级不一致情况
|
2023-03-04 20:47:48 +08:00 |