Commit Graph

1475 Commits

Author SHA1 Message Date
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
648540858
f731d83728 修复ssrc变化时端口变化的问题 2022-07-29 11:57:04 +08:00
648540858
3fbe95bd79 Merge pull request #556 from linhuaichuan/wvp-28181-2.0
fix 优化pom依赖,去除几个重复客户端。并改了几个 equals判断不精准的bug
2022-07-28 16:25:00 +08:00
648540858
9e949b2f80 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2022-07-28 16:24:51 +08:00
648540858
bb6240f5a4 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-07-28 16:21:09 +08:00
648540858
a4671aebd3 优化hook订阅机制 2022-07-28 16:18:41 +08:00
648540858
6e208d6d98 优化gps信息存入数据库 2022-07-28 11:22:51 +08:00
庄梦蝶殇
fd22fe2f13 fix 优化pom依赖,去除几个重复客户端。并改了几个 equals判断不精准的bug 2022-07-27 18:31:33 +08:00
648540858
e6eac5c792 优化部分hook订阅 2022-07-27 16:16:12 +08:00
648540858
ecd404c776 去除多余内容 2022-07-27 14:53:19 +08:00
648540858
9d48c21d76 去除多余内容 2022-07-27 14:51:49 +08:00
648540858
881fb113e1 修复流地址返回错误 2022-07-27 14:48:21 +08:00
648540858
4f2282f125 bug修复 2022-07-27 11:11:18 +08:00
648540858
14270c619e bug修复 2022-07-26 11:43:56 +08:00
648540858
3d058b506e 修复推流推流状态提示 2022-07-25 11:17:46 +08:00
648540858
d7135965da 修复级联无通道时更新停止在等待更新的问题 2022-07-25 09:44:43 +08:00
648540858
c53622e802 更新mysql.sql 2022-07-22 16:05:23 +08:00
648540858
72f80bb672 增加推流添加功能,修复级联目录推送 2022-07-22 16:02:14 +08:00
648540858
9d025ad4cf Merge pull request #549 from TristingChen/fix-channel_status
优化----设备下线,通道状态也切换至离线状态
2022-07-20 17:54:42 +08:00
chenjialing
9d2872e275 优化----设备下线,通道状态也切换至离线状态 2022-07-20 17:02:55 +08:00
mrjackwang
b0884e92e4 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-07-20 13:51:30 +08:00
jiang
9851e11d91 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-07-19 18:13:42 +08:00
jiang
716f0b95cc 1.修复新增用户没有pushkey的问题
2.将重置pushkey改为修改pushkey
2022-07-19 18:13:19 +08:00
648540858
64f6d596f4 移除共享所有直播流功能 2022-07-19 17:46:16 +08:00
648540858
fe6ca0c571 优化推流列表 2022-07-19 16:37:34 +08:00
648540858
a9fcd4502c 修复推流导入模板 2022-07-19 15:27:33 +08:00
648540858
f69f1bcb5f 修复更新推流状态sql错误 2022-07-19 14:27:30 +08:00
648540858
86deeedf85 修复用户查询sql错误 2022-07-19 11:13:46 +08:00