648540858
|
a000ed6062
|
完善talk模式
|
2023-03-20 14:20:28 +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
|
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
|
bea5b40bf5
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2023-03-14 16:56:05 +08:00 |
|
648540858
|
943f95ba8c
|
增加消息通道配置，可以通道redis在wvp上下级之间发送消息
|
2023-03-14 14:02: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 |
|
wangyimeng
|
a0cdc7c59d
|
修复查询历史录像无记录时报错问题
|
2023-03-03 21:01:43 +08:00 |
|
wangyimeng
|
9c34978963
|
修复查询设备通道目录时查询报错的问题
|
2023-03-03 20:59:56 +08:00 |
|
wangyimeng
|
6afcd5176b
|
请求历史媒体下载增加回复事件处理ssrc与下级不一致情况
|
2023-03-03 20:59:10 +08:00 |
|
lovemen
|
845ce53313
|
解决上级平台点播proxy代理流时未携带SSRC信息,gbStream采用默认0000000000作为SSRC无法播放问题。以及上级平台点播proxy代理流时回复的SDP本地端口号为0不兼容问题。
|
2023-02-23 15:35:42 +08:00 |
|
648540858
|
420dbce900
|
Merge branch 'main' into 级联
# Conflicts:
# 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-02-22 18:14:53 +08:00 |
|
648540858
|
019d95cfba
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2023-02-22 18:08:25 +08:00 |
|
648540858
|
100252a253
|
完善语音对讲
|
2023-02-22 18:06:52 +08:00 |
|
648540858
|
2d2832dbe9
|
优化各个配置启动顺序
|
2023-02-22 18:01:30 +08:00 |
|
648540858
|
db8971302a
|
完善支持语音级联
|
2023-02-22 15:53:33 +08:00 |
|
648540858
|
4446218f9e
|
修复通道导入bug
|
2023-02-20 15:21:41 +08:00 |
|
648540858
|
21d5bed1a9
|
Merge pull request #744 from gaofuwang/wvp-28181-2.0
优化WVP作为下级平台查询设备录像列表上报缓慢问题
|
2023-02-20 09:57:21 +08:00 |
|
648540858
|
663130df45
|
完善支持语音对讲talk
|
2023-02-19 12:46:53 +08:00 |
|
刘跃龙
|
7c019dbeef
|
RTP推流地址应使用SDP中Connection中的IP地址，原来使用Origin中的IP地址，在流媒体服务和信令服务不在同一台设备上时，媒体流数据将发给信令服务器，导致无法播放BUG。
|
2023-02-16 18:18:10 +08:00 |
|
648540858
|
b13ecc578c
|
修复级联推送通道时缺少的信息
|
2023-02-16 16:25:47 +08:00 |
|
648540858
|
842f40df34
|
修复更新通道是更新各个坐标系的位置信息
|
2023-02-16 14:01:09 +08:00 |
|
648540858
|
7be636f8b8
|
修复更新通道是更新各个坐标系德位置信息
|
2023-02-15 18:30:35 +08:00 |
|
648540858
|
2c7ed82b3e
|
修复缺少的属性
|
2023-02-15 15:38:49 +08:00 |
|
648540858
|
bdc0f83e29
|
启动时清理无效的设备缓存数据，避免设备无法注册
|
2023-02-14 15:12:53 +08:00 |
|
648540858
|
a209d17390
|
Merge branch 'wvp-28181-2.0'
|
2023-02-14 11:29:44 +08:00 |
|
648540858
|
d5f26faf15
|
优化语音对讲级联，目前等待zlm支持openRTPServer仅收音频
|
2023-02-14 11:29:22 +08:00 |
|
648540858
|
5cae58c691
|
Merge branch 'wvp-28181-2.0' into main2
|
2023-02-14 10:04:48 +08:00 |
|