Commit Graph

1402 Commits

Author SHA1 Message Date
xingqiao
1407090463 Merge branch 'wvp-28181-2.0' of https://github.com/ixingqiao/wvp-GB28181-pro into wvp-28181-2.0 2022-08-26 11:53:28 +08:00
xingqiao
e694109748 剔除lettuce 解决轮播场景下的redis读写超时问题 2022-08-26 11:53:11 +08:00
百鸣
f2f37ee785 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-08-26 11:49:43 +08:00
648540858
f110550363 去除文档捐赠 2022-08-26 11:06:50 +08:00
xingqiao
37e4375037 1.解决轮询内存增长过快问题 2022-08-26 11:03:43 +08:00
648540858
42ccd2b7f0 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-08-23 11:00:57 +08:00
648540858
b33d179ee3 优化国标录像的异常判断 2022-08-23 11:00:46 +08:00
648540858
a931d0d5f7 Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 2022-08-22 23:01:52 +08:00
648540858
9ef08551b6 修复使用ssl的配置 2022-08-22 23:00:13 +08:00
648540858
26a52d2d16 支持全局异常和统一返回结果 2022-08-22 16:17:28 +08:00
648540858
43bb25d305 支持全局异常和统一返回结果,未完待续 2022-08-22 16:17:28 +08:00
648540858
12de9cce17 Merge pull request #578 from urmyfaith/patch-1
fix PlatformKeepaliveExpireEvent typo
2022-08-22 15:03:18 +08:00
zx
234359e847 fix PlatformKeepaliveExpireEvent typo 2022-08-19 21:55:59 +08:00
648540858
8ef0619d9a 更新在线文档的等新方式 2022-08-19 17:22:08 +08:00
648540858
bc8bb58971 依赖包版本升级 2022-08-19 17:12:03 +08:00
648540858
3e6f161100 依赖包版本升级 2022-08-19 17:11:51 +08:00
jiang
fd79d37fe6 根据redis消息更新推流列表 2022-08-18 16:17:23 +08:00
jiang
36a803f816 实时直播 - 开始直播接口返回值增加WEBRTC字段 2022-08-18 15:32:12 +08:00
648540858
1d2c9f2049 去除连接池中wall配置,此配制影响批量执行sql 2022-08-18 10:15:49 +08:00
648540858
03c0232804 处理获取消息体内容为空时造成的空指针异常 2022-08-17 17:06:33 +08:00
648540858
46317f896b 处理获取消息体内容为空时造成的空指针异常 2022-08-17 16:45:06 +08:00
648540858
aa7ab1e479 优化队列的处理逻辑 2022-08-17 15:38:06 +08:00
648540858
d7865d55e1 修复录像回放中的信令错误 2022-08-15 15:08:51 +08:00
648540858
8f629a15cf 修复文档错误 2022-08-12 10:00:18 +08:00
648540858
35d6d44138 优化使用tcp连接时的超时时间 2022-08-11 16:37:55 +08:00
648540858
dcd772cb4d 去除jedis,方便支持redis集群 2022-08-10 18:14:33 +08:00
648540858
23b8057a28 Merge pull request #570 from TristingChen/optimize--play-complete
优化--直播接口流程结束异步处理截图操作,提高接口响应速度和并发能力
2022-08-09 17:34:36 +08:00
chenjialing
58201f41f2 优化--直播结束异步处理截图操作,提高接口响应速度和并发能力 2022-08-09 17:26:32 +08:00
648540858
5195623cf0 更新文档 2022-08-09 10:58:38 +08:00
648540858
2d10658ec3 更新文档 2022-08-09 10:57:33 +08:00
648540858
d872c56ac7 更新readme 2022-08-09 10:50:02 +08:00
648540858
a587383c8d 添加文档 2022-08-09 09:45:32 +08:00
648540858
762fff4f01 Merge pull request #567 from mrjackwang/wvp-28181-2.0
更新上级级联查看直播视频及代理拉流视频流bug
2022-08-08 09:32:38 +08:00
648540858
245b70f7ce Merge pull request #568 from zouyaoji/wvp-28181-2.0
前端显示媒体服务器配置时报错修复
2022-08-08 09:28:46 +08:00
wym
9c4c1159a7 zlm关闭一段时间后,重启后信令服务不重连zlm 2022-08-08 08:31:12 +08:00
zouyaoji
1c3c757d30 前端显示媒体服务器配置时报错修复 2022-08-06 11:27:02 +08:00
mrjackwang
0cd72f7d7d Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-08-06 09:42:28 +08:00
gushouzheng
f3ff294a8e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-08-06 09:00:14 +08:00
gushouzheng
b39993cf3d 更新级联查看直播视频及代理拉流视频bug 2022-08-06 08:58:17 +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
648540858
a4c5184706 修复单个添加的推流级联国标的问题 2022-08-05 09:48:13 +08:00
jiang
23361881e4 修改‘修改pushkey’窗口的标题提示文案 2022-08-04 17:01:31 +08:00
648540858
6df800eec1 Merge pull request #353 from mrjackwang/wvp-28181-2.0
拉流添加国标编码上级级联调取视频404
2022-08-02 15:41:07 +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
cbab9c9be1 修复二级目录添加失败的问题 2022-08-02 11:34:56 +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