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

256 Commits

Author SHA1 Message Date
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
5fab97cf7e 支持不同域的前后端分离部署 2023-03-15 19:05:56 +08:00
648540858
943f95ba8c 增加消息通道配置，可以通道redis在wvp上下级之间发送消息 2023-03-14 14:02:33 +08:00
648540858
a7c3cf5316 优化跨域配置，支持同域的前后端分离部署 2023-03-05 09:53:26 +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
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
8b0662ebfe 优化国标录像下载错误提示 2023-01-10 11:36:54 +08:00
648540858
9b9a13ab36 国标录像UI重构 2023-01-09 16:31:51 +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
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
xiaoQQya
189b6044b4 fix(devicePlayer): 修复设备视频播放页 HTTPS 环境下 WebRTC 无法播放的问题 2022-11-05 11:46:39 +08:00
xiaoQQya
3e71e0bdf1 perf(rtcPlayer): 修改控制台 log 级别 2022-11-05 11:35:01 +08:00
648540858
aed45e0f0d 优化多网卡 2022-10-28 16:40:12 +08:00
648540858
0f0ece2401 设备编辑增加收流IP 2022-10-25 10:17:59 +08:00
648540858
958474c646 首页改造完成,添加系统信息 2022-10-24 18:14:31 +08:00
648540858
b6bcb5f2f4 隐藏liveplayer 2022-10-19 10:28:51 +08:00
648540858
b64d701f37 隐藏liveplayer 2022-10-19 10:07:47 +08:00
648540858
55b53caef1 支持手动添加，为设备设置单独的密码 2022-10-18 17:35:44 +08:00
648540858
688e222dcc 优化按需拉流配置，拉流代理支持按需拉流 2022-10-18 17:35:32 +08:00
648540858
82fd369ce5 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2022-10-17 16:56:13 +08:00
648540858
7918f03734 优化按需拉流配置，拉流代理支持按需拉流 2022-10-17 16:38:28 +08:00
648540858
6bfd48776d 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/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
 2022-10-17 12:45:56 +08:00
648540858
4f2191dc9f 增加liveplayer播放器 2022-10-17 10:30:44 +08:00
XiaoQiTong
dabee4ed7d 增加指定流媒体收流功能 2022-10-15 20:57:24 +08:00
648540858
06bbe3fe01 添加第二种语音对讲实现 2022-09-29 16:27:59 +08:00
648540858
d7a1b94f90 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/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/message/response/cmd/BroadcastResponseMessageHandler.java
 2022-09-24 21:04:58 +08:00
648540858
710600db6f 优化sip消息，去除自动dialog创建 2022-09-21 18:18:37 +08:00
648540858
1ee56d50d8 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-09-16 18:04:13 +08:00
648540858
692f716788 优化点播时RtpServer为正常关闭的问题 2022-09-16 18:02:56 +08:00
wenyanjun
12571e0db1 修复下载录像失败问题 2022-09-14 14:32:22 +08:00
648540858
2f76fa98bb Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	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
 2022-09-08 09:46:35 +08:00