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

1807 Commits (30ae9e929fad80f624ab632c53081db3d2dc9aec)

Author SHA1 Message Date
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
648540858 a5d9afeb60
Merge pull request #753 from lovemen/wvp-28181-2.0 
解决上级平台点播proxy代理流时未携带SSRC信息,gbStream采用默认0000000000作为SSRC无法播放问题。以及上级平台点…
 2023-03-04 14:47:47 +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 d0532e7749
Merge pull request #751 from yjkhtddx/wvp-28181-2.0 
RTP推流地址应使用SDP中Connection中的IP地址
 2023-02-20 09:51:51 +08:00
648540858 307a68de73
Merge pull request #752 from stayorigin/wvp-28181-2.0 
替换前端编译npm源地址
 2023-02-20 09:50:14 +08:00
648540858 663130df45 完善支持语音对讲talk 2023-02-19 12:46:53 +08:00
hujian 9dcae6e4bf 替换前端编译npm源地址为https://registry.npmmirror.com 2023-02-16 23:08:34 +08:00
hujian f7b67e28cc 替换前端编译npm源地址 2023-02-16 23:04:33 +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 81da03d981
Merge pull request #743 from zhulangren/patch-1 
Update CloudRecordDetail.vue
 2023-02-14 14:47:07 +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
648540858 3380ce30a2 合并主线 2023-02-13 20:52:36 +08:00
648540858 d79eec25b0 优化日志打印，去除数据库打印，优化控制台打印效果 2023-02-13 18:19:34 +08:00
gaofw189 39199a1daa 优化WVP作为下级平台查询设备录像列表上报缓慢问题 2023-02-13 10:37:00 +08:00
逐浪人 342361cef8
Update CloudRecordDetail.vue 
修复 download.html 找不到 的问题，它被 assist放在www目录不是 recored目录
 2023-02-11 22:08:51 +08:00
648540858 93c632f208 合并主线 2023-02-10 16:47:04 +08:00
648540858 197f80581b Merge branch 'main' into main2 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-02-10 16:25:33 +08:00
648540858 f2c6210539 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	doc/_content/introduction/deployment.md
#	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/media/zlm/ZLMRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-02-10 16:24:27 +08:00
648540858 ec95a42985 Merge branch 'main' into main2 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-02-10 15:54:42 +08:00
648540858 bb49f1f0d6 添加文档 2023-02-10 15:33:00 +08:00
648540858 b010e63dc0 更新文档 2023-02-09 14:36:04 +08:00
648540858 e0c8216f58 恢复默认判断 2023-02-09 14:22:12 +08:00
648540858 48fad3582d Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-02-09 14:13:57 +08:00
648540858 03ee15ece2
Merge pull request #741 from gaofuwang/wvp-28181-2.0 
修复WVP作为下级平台接收上级平台DeviceControl、RecordInfo信令处理问题和Alarm信令上报上级平台问题
 2023-02-09 14:13:44 +08:00
gaofw189 5462b1f6c6 去除lombok依赖-后续考虑引入 2023-02-09 09:20:46 +08:00
648540858 6484f52e46 同时支持打包为Jar和War 2023-02-07 20:59:33 +08:00