XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,876 Commits 2 Branches 0 Tags
e5faad8b8dbe8cbb90458b87c5f40943dde34ec4
Commit Graph

679 Commits

Author SHA1 Message Date
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
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
648540858
22a205e8fc 优化异常处理 2023-03-17 14:02:16 +08:00
648540858
c3ce2bc5d0 优化异常处理以及级联设备状态查询 2023-03-17 13:22:05 +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
5fab97cf7e 支持不同域的前后端分离部署 2023-03-15 19:05:56 +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
a7c3cf5316 优化跨域配置，支持同域的前后端分离部署 2023-03-05 09:53:26 +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
逐浪人
342361cef8 Update CloudRecordDetail.vue 
修复 download.html 找不到 的问题，它被 assist放在www目录不是 recored目录
 2023-02-11 22:08:51 +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
6484f52e46 同时支持打包为Jar和War 2023-02-07 20:59:33 +08:00
648540858
922a9e8b32 修复语音对讲返回的地址 2023-02-07 14:52:33 +08:00
648540858
c226deacff 修复语音对讲发送页 2023-02-07 10:04:15 +08:00
648540858
2b1f7a4739 Merge branch 'wvp-28181-2.0' into fix-269 2023-02-01 10:56:40 +08:00
648540858
dea44dcd78 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.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/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-01-13 16:21:17 +08:00
648540858
d4fdea3df9 修复国标录像查询ui 2023-01-11 10:43:56 +08:00
648540858
72a1f12208 优化国标录像UI 2023-01-10 14:01:03 +08:00
648540858
8b0662ebfe 优化国标录像下载错误提示 2023-01-10 11:36:54 +08:00
648540858
9b9a13ab36 国标录像UI重构 2023-01-09 16:31:51 +08:00
Lyon1994
aa71a33c38 [ fix bug ] 修复分屏播放无效的问题,这是一个json解析错误 2022-12-26 11:36:31 +08:00
648540858
4b827f3897 级联语音对讲部分 2022-12-13 11:57:07 +08:00
648540858
131ea77669 接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址 2022-12-06 10:33:43 +08:00
xiaoQQya
2d8f57f3c9 fix(devicePlayer): 修复设备视频播放页 RTCS 地址显示错误的问题 2022-11-30 16:29:30 +08:00
648540858
6c9d6f0054 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
 2022-11-29 13:16:20 +08:00
648540858
f89491ada3 修复单端口模式下ssrc的释放 #667 2022-11-25 14:38:46 +08:00
648540858
d7623b5ca8 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/RequestSendItemMsg.java
 2022-11-25 10:57:53 +08:00
648540858
fa2ccb4ec8 修复协议端口配置不全导致前端播放页面无法弹出的问题 2022-11-25 10:50:16 +08:00
648540858
12fa3b4c8d Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2022-11-23 09:57:17 +08:00
648540858
8ea6e192d9 优化拉流代理表单以及逻辑 2022-11-22 17:17:35 +08:00
648540858
1469971102 支持配置设备上线时自动更新查询通道，修复通道刷新进度展示 2022-11-22 15:02:25 +08:00
648540858
1983b8b0a7 国标级联->选择通道支持移除目前下所有以及全部添加到目录下 2022-11-22 12:55:29 +08:00
648540858
ecf84bb0f1 合并主线 2022-11-18 21:52:02 +08:00
648540858
f223aad705 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/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.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/RegisterRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.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/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.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
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/dialog/devicePlayer.vue
 2022-11-18 18:39:44 +08:00
648540858
d340a37a00 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	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/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-11-17 11:31:30 +08:00
648540858
694076dc8c 优化国标级联发流并发能力 2022-11-16 09:39:27 +08:00
648540858
96bb3814f6 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue
 2022-11-08 20:43:25 +08:00
648540858
d040254430 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2022-11-08 20:04:23 +08:00
648540858
f4ee7271e7 Merge pull request #661 from xiaoQQya/wvp-28181-2.0 
修复分屏监控与视频播放页在 HTTPS 环境下无法播放的问题
 2022-11-08 20:03:01 +08:00
648540858
4c8e2beb4d 优化hook处理速度 2022-11-08 19:58:36 +08:00