Commit Graph

402 Commits

Author SHA1 Message Date
648540858
6c0a609134 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
5057c16f14 优化国标级联发流并发能力 2022-11-16 09:39:27 +08:00
648540858
f210b0b736 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
4fcc14fba4 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2022-11-08 20:04:23 +08:00
648540858
53934e3fca Merge pull request #661 from xiaoQQya/wvp-28181-2.0
修复分屏监控与视频播放页在 HTTPS 环境下无法播放的问题
2022-11-08 20:03:01 +08:00
648540858
971b73b341 优化hook处理速度 2022-11-08 19:58:36 +08:00
xiaoQQya
8896b18273 fix(live): 修复分屏监控 HTTPS 环境下无法播放的问题 2022-11-05 12:50:26 +08:00
xiaoQQya
0ce0a954ea fix(devicePlayer): 修复设备视频播放页 HTTPS 环境下 WebRTC 无法播放的问题 2022-11-05 11:46:39 +08:00
xiaoQQya
dad55c3e08 perf(rtcPlayer): 修改控制台 log 级别 2022-11-05 11:35:01 +08:00
唐嗣成
09768a19e8 my 2022-11-04 17:35:43 +08:00
648540858
4d3b5853f9 优化多网卡 2022-10-28 16:40:12 +08:00
648540858
9ea33381cc 设备编辑增加收流IP 2022-10-25 10:17:59 +08:00
648540858
0b18018da2 首页改造完成,添加系统信息 2022-10-24 18:14:31 +08:00
648540858
439d94f004 首页改造完成,待添加系统信息 2022-10-24 15:20:35 +08:00
648540858
f0f6be9238 首页改造,完成cpu,内存,网络图 2022-10-20 18:03:40 +08:00
648540858
86f3f80d00 隐藏liveplayer 2022-10-19 10:28:51 +08:00
648540858
049dda7209 隐藏liveplayer 2022-10-19 10:07:47 +08:00
648540858
8d8bb223aa Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
#	sql/mysql.sql
2022-10-19 10:04:04 +08:00
XiaoQiTong
553868cb28 修改云端录像选择节点流媒体path不修改的bug
device表增加的mediaServerId字段丢失,重新添加
2022-10-18 20:18:51 +08:00
648540858
82d74c06ea 支持手动添加,为设备设置单独的密码 2022-10-18 17:35:44 +08:00
648540858
c8c1779bab 优化按需拉流配置,拉流代理支持按需拉流 2022-10-18 17:35:32 +08:00
648540858
af317662a5 支持手动添加,为设备设置单独的密码 2022-10-18 17:02:05 +08:00
648540858
6eb98d7b80 优化按需拉流配置,拉流代理支持按需拉流 2022-10-17 16:38:28 +08:00
648540858
9a147ef84a 增加liveplayer播放器 2022-10-17 10:30:44 +08:00
XiaoQiTong
153385cd66 增加指定流媒体收流功能 2022-10-15 20:57:24 +08:00
648540858
4f4bf33670 优化sip消息,去除自动dialog创建 2022-09-21 18:18:37 +08:00
648540858
da6fb8e71b Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-09-16 18:04:13 +08:00
648540858
c7f478892b 优化点播时RtpServer为正常关闭的问题 2022-09-16 18:02:56 +08:00
wenyanjun
4a96fd8468 修复下载录像失败问题 2022-09-14 14:32:22 +08:00
648540858
5c211a66e9 优化sip消息 2022-09-09 17:06:19 +08:00
jiang
0fb8f26fea 1.根据redis消息更新推流列表时同时更新在线状态
2.推流列表的模板增加在线状态
2022-09-07 15:56:48 +08:00
648540858
727ad56ddb 修复选择通道时默认节点显示错误的问题 2022-09-06 16:31:28 +08:00
648540858
561542aa42 添加对海康平台录像回放的兼容,修复录像信息发送失败, 级联平台支持开启rtcp保活 2022-09-05 17:10:21 +08:00
648540858
90aa9be073 优化异常处理 2022-09-01 17:53:00 +08:00
648540858
52fbdb096f 云端录像详情页添加返回按钮 2022-08-31 18:07:53 +08:00
648540858
e4bd61860d 去除对redis key过期事件的使用;重构国标级联的注册保活 2022-08-31 11:29:13 +08:00
648540858
024e61e1c9 修复bug以及日志按照,错误/sip/数据库 分割 2022-08-26 18:03:09 +08:00
648540858
b33d179ee3 优化国标录像的异常判断 2022-08-23 11:00:46 +08:00
648540858
26a52d2d16 支持全局异常和统一返回结果 2022-08-22 16:17:28 +08:00
648540858
43bb25d305 支持全局异常和统一返回结果,未完待续 2022-08-22 16:17:28 +08:00
zouyaoji
1c3c757d30 前端显示媒体服务器配置时报错修复 2022-08-06 11:27:02 +08:00
648540858
2543a9c10c 优化用户表单 2022-08-05 17:27:18 +08:00
648540858
24540b08c4 去除点播界面双loading 2022-08-05 17:20:26 +08:00
648540858
ec61dc7c36 推流列表增加经纬度的添加 2022-08-05 17:10:53 +08:00
jiang
23361881e4 修改‘修改pushkey’窗口的标题提示文案 2022-08-04 17:01:31 +08:00
mrjackwang
bc98545fb4 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-08-02 15:32:15 +08:00
648540858
0d2d73117e 修复视频播放点击音量报错 #557,修复编解码信息获取失败 2022-08-01 14:33:51 +08:00
648540858
db929e5da9 修复首页未获取到zlm消息时发送错误消息的bug 2022-08-01 09:32:39 +08:00
mrjackwang
51014f0c8f Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-07-29 15:16:39 +08:00
648540858
14270c619e bug修复 2022-07-26 11:43:56 +08:00