Commit Graph

1457 Commits

Author SHA1 Message Date
WuPeng
2b7a21529f 弃用废弃方法toJavaObject,改用to方法,消除编译警告。 2022-11-27 10:28:42 +08:00
648540858
707d942dd4 修复单端口模式下ssrc的释放 #667 2022-11-25 14:38:46 +08:00
648540858
57f1f599d4 优化注释 2022-11-25 12:12:35 +08:00
648540858
8368b84a3b 优化okhttp并发参数 2022-11-25 11:57:46 +08:00
648540858
6d60595aa9 清空级联录像记录 #672 2022-11-25 11:17:48 +08:00
648540858
6c1397a01e 修复协议端口配置不全导致前端播放页面无法弹出的问题 2022-11-25 10:50:16 +08:00
648540858
9a2cdbba14 优化拉流代理注释 2022-11-22 17:30:49 +08:00
648540858
b0581e2bf5 优化拉流代理表单以及逻辑 2022-11-22 17:17:35 +08:00
648540858
e7952f1e12 支持配置设备上线时自动更新查询通道,修复通道刷新进度展示 2022-11-22 15:02:25 +08:00
648540858
c43fbab56f 国标级联->选择通道支持移除目前下所有以及全部添加到目录下 2022-11-22 12:55:29 +08:00
648540858
1e7ce98967 修复使用来源IP作为流ip配置 2022-11-21 10:07:27 +08:00
648540858
a62b61c991 移除重复方法 2022-11-18 17:29:22 +08:00
648540858
d3acb6ab11 更新文档 2022-11-18 17:26:58 +08:00
648540858
c545d6b6dc 添加远程启动信令 2022-11-18 17:17:01 +08:00
648540858
5e4434aee8 Merge pull request #673 from 648540858/wvp-28181-2.0-multi-network
Wvp 28181 2.0 multi network
2022-11-17 18:22:24 +08:00
648540858
93de57c83f 清理过期的推流鉴权信息 2022-11-17 18:21:45 +08:00
648540858
36d0be9698 优化级联注册稳定性 2022-11-17 18:09:28 +08:00
648540858
42f48ca008 优化多网卡下的localIp获取 2022-11-17 17:01:54 +08:00
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
ed41962d9c 注释与日志优化 2022-11-17 10:04:05 +08:00
648540858
5057c16f14 优化国标级联发流并发能力 2022-11-16 09:39:27 +08:00
648540858
a60c8939ae 去除发送流端口范围 2022-11-10 16:48:17 +08:00
648540858
d84fbe5ad9 优化使用来源ip作为流ip 2022-11-10 09:40:01 +08:00
648540858
dca588ffcc 添加缺少的导入 2022-11-09 10:18:42 +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
e4105a958b 优化线程休眠异常日志 2022-11-08 20:40:03 +08:00
648540858
5699c7d0e4 支持配置是否开去推流鉴权 2022-11-08 20:29:27 +08:00
648540858
7a82f02415 Merge pull request #660 from shawn-tangsc/wvp-28181-2.0
前端首页控制台设备在线数显示bug修复
2022-11-08 20:04:30 +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
648540858
8c0e5dbdd3 Merge pull request #662 from AlphaWu/Zafu-Dev-1105
升级Fastjson到Fastjson2
2022-11-08 19:48:36 +08:00
WuPeng
4cc0c04b41 升级Fastjson到Fastjson2 2022-11-05 20:49:56 +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
a83b0f1931 Merge pull request #658 from itouxin/patch-2
Update play_error.md
2022-11-03 20:39:30 +08:00
TouXin
39a9c35712 Update play_error.md
修复描述文字错误
2022-11-03 10:21:08 +08:00
648540858
ad7d975908 Merge pull request #655 from L120820/wvp-28181-2.0
【同步设备通道】第一次收到同步通道数据应该将通道数据放入 不然会造成通道数量不一致 同步时也会漏掉第一个通道
2022-11-01 20:43:58 +08:00
ljm
d2826a164e 【同步设备通道】第一次收到同步请求应该将通道放入 不然会造成通道数量不一致 同步时也会漏掉第一个通道 2022-11-01 17:25:47 +08:00
648540858
4d3b5853f9 优化多网卡 2022-10-28 16:40:12 +08:00
648540858
6f2badd6a4 支持多网卡 2022-10-26 17:15:29 +08:00
648540858
a6b465ac05 Merge pull request #647 from L120820/wvp-28181-2.0
【zlm心跳hook】重复查询redis了
2022-10-25 14:43:12 +08:00
648540858
f5aec105ce 修复设备信息后同步redis 2022-10-25 10:27:32 +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
ljm
eabe06346f 【zlm心跳hook】重复查询redis了
变量也不需要多次定义
数据库有的话应该恢复zlm
缓存没有的话需要重新加载缓存
2022-10-22 09:48:45 +08:00
648540858
f0f6be9238 首页改造,完成cpu,内存,网络图 2022-10-20 18:03:40 +08:00