Commit Graph

1966 Commits

Author SHA1 Message Date
648540858
99506108cd 添加日志 2023-10-26 15:29:04 +08:00
648540858
5ff2faa5bd 添加日志 2023-10-25 15:02:15 +08:00
648540858
79f3ca9791 优化收藏功能 2023-10-25 14:45:45 +08:00
648540858
cccfdace5b 优化sql 2023-10-25 10:11:33 +08:00
648540858
e11671a1fb 优化sql 2023-10-24 18:20:24 +08:00
648540858
16c056e338 优化云端录像转化 2023-10-23 17:59:27 +08:00
648540858
daac0010b1 优化云端录像定时清理 2023-10-19 17:52:19 +08:00
648540858
9b036fb71d 优化云端录像页面 2023-10-18 15:33:31 +08:00
648540858
92a25393f3 基于新的云端录像实现页面功能 2023-10-17 17:55:40 +08:00
648540858
5a75381a00 基于新的云端录像结构实现国标录像 2023-10-17 15:34:01 +08:00
648540858
7aa8444e67 临时提交 2023-10-13 18:25:36 +08:00
648540858
4d62f77025 Merge branch 'wvp-28181-2.0' into wvp-28181-record 2023-10-13 15:45:23 +08:00
648540858
12c4128e81 修复目录更新时已删除数据的整理功能 2023-10-13 15:44:49 +08:00
648540858
e4d37864d1 开始重构云端录像继续 2023-10-13 15:26:51 +08:00
648540858
298a9f4280 开始重构云端录像 2023-10-12 18:34:16 +08:00
648540858
78f628dd6f 修复同步目录时批量提交的错误 2023-10-12 17:01:25 +08:00
648540858
7d6aaf3bb0 修复国标接连选择通道相关的问题 2023-10-12 16:36:07 +08:00
648540858
205f1f1f60 优化国标级联心跳失败再次注册的逻辑 2023-10-08 15:41:24 +08:00
648540858
c084d6c98a 优化国标级联心跳失败判断逻辑 2023-10-07 18:00:08 +08:00
648540858
4c28f380aa 优化byte数组转换 2023-10-07 14:52:46 +08:00
648540858
94a0de0d27 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-09-30 06:09:57 +08:00
648540858
130dc5d82d 优化拉流代理逻辑,修复ffmpeg拉流代理鉴权 2023-09-30 06:09:16 +08:00
648540858
32f1a0aa6e
Merge pull request #1094 from lunasaw/wvp-dev-0928
fix hasSubChannel
2023-09-29 06:24:59 +08:00
chenzhangyue
7620527340 fix hasSubChannel 2023-09-28 16:00:05 +08:00
648540858
483d5e04a7 优化拉流代理 2023-09-25 18:51:02 +08:00
648540858
e8411bc797 修复截图截图未关闭流 #1087 2023-09-25 16:22:36 +08:00
648540858
b9a33f03d6 国标级联支持添加通道后主动推动到上级 2023-09-22 17:46:31 +08:00
648540858
a34db2ee8b 增加根据国标编号添加国标级联通道的接口 2023-09-21 21:34:02 +08:00
648540858
4ba0e3c13e
Merge pull request #1077 from binban/fix-use-source-ip-as-stream-ip
fix-use-source-ip-as-stream-ip
2023-09-20 09:14:48 +08:00
Cloud User
bc431e4290 fix-use-source-ip-as-stream-ip 2023-09-15 22:39:08 +08:00
648540858
e073b60cb1
Merge pull request #1071 from lunasaw/dev-wvp-0911
generate @param
2023-09-15 14:29:01 +08:00
648540858
2d11f1b3de 修复ssrc缓存初始化判断错误,导致初始化失败 2023-09-15 14:25:08 +08:00
648540858
2d423d9668 Merge branch 'xinchuang' into wvp-28181-2.0 2023-09-15 09:35:14 +08:00
chenzhangyue
54038486f4 generate @param 2023-09-12 20:23:14 +08:00
648540858
d05bce8f7f 修复对接金仓数据库中的问题 2023-09-12 15:32:17 +08:00
648540858
a6fb1cdb74 修复Web页面播放国标录像无声音的问题 2023-09-11 16:17:29 +08:00
648540858
f57ed350b3 添加设置mobilePosition中ChannelId #1054 2023-09-11 11:01:20 +08:00
648540858
4f90b28b93 修复自动点播超时后无法继续点播的问题 2023-09-11 10:36:40 +08:00
648540858
d02078397e 修复修改流传输模式 2023-09-06 16:37:41 +08:00
648540858
212218c7c4
Merge pull request #1057 from lunasaw/dev-wvp-0906
fix set password
2023-09-06 10:32:24 +08:00
648540858
3cdede80f9
Merge pull request #1059 from DavidSche/fix_#1058
修复 #1058 错误
2023-09-06 10:32:15 +08:00
davidche
18aff4b546
修复 #1058 2023-09-06 10:30:20 +08:00
648540858
33d4107d0c 修复启动时如果上机平台不可连接的导致的持续报错 2023-09-06 10:21:42 +08:00
chenzhangyue
1d0c9c6a31 fix set password 2023-09-06 09:49:50 +08:00
648540858
fd0ff18a71
Merge pull request #1055 from lunasaw/dev-wvp-0905
fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set
2023-09-06 09:32:15 +08:00
648540858
0e9cb5ceb6
Merge pull request #1048 from lunasaw/wvp-dev-0901
bugfix:这里应该不存在key才初始化一次
2023-09-06 09:31:43 +08:00
chenzhangyue
7155680793 fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set 2023-09-05 17:35:46 +08:00
chenzhangyue
73f6f044a1 local dev 2023-09-01 17:53:48 +08:00
chenzhangyue
bf8fbf4927 bugfix:这里应该不存在key才初始化一次 2023-09-01 17:22:53 +08:00
648540858
cde7f6460a
Merge pull request #999 from a24211317/wvp-28181-2.0
解决两个国标平台相互级联时,上级不能获取目录的问题
2023-09-01 09:21:05 +08:00