Commit Graph

2077 Commits (52c56bfdf2247c0f108d9210a7c89bf803e3b316)

Author SHA1 Message Date
648540858 6255e6f89f 支持自动同步国标通道到通用通道,分组信息以及行政区划自动同步 2023-10-04 00:59:16 +08:00
648540858 8f7673a083 Merge branch 'wvp-28181-2.0' into database-structure-optimization
# Conflicts:
#	sql/2.6.9更新.sql
2023-10-01 23:59:04 +08:00
AlphaWu f6c1ce15e4 修复数据库脚本的BUG。 2023-10-01 12:29:48 +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 e2f0533510 添加字段控制是否自动同步国标通道 2023-09-26 15:39:52 +08:00
648540858 483d5e04a7 优化拉流代理 2023-09-25 18:51:02 +08:00
648540858 527dd66c0d 添加字段控制是否自动同步国标通道 2023-09-25 18:20:05 +08:00
648540858 e8411bc797 修复截图截图未关闭流 #1087 2023-09-25 16:22:36 +08:00
648540858 ea271bf4b9 添加字段控制是否自动同步国标通道 2023-09-25 16:13:38 +08:00
648540858 94ec880fe8 Merge branch 'wvp-28181-2.0' into database-structure-optimization
# Conflicts:
#	sql/2.6.9更新.sql
2023-09-22 17:46:58 +08:00
648540858 b9a33f03d6 国标级联支持添加通道后主动推动到上级 2023-09-22 17:46:31 +08:00
che_shuai da63ef5b19 推流列表-->添加通道 补充播放需要的默认参数 媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示) 2023-09-22 11:34:10 +08:00
648540858 37915522d7 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-22 09:43:59 +08:00
648540858 a34db2ee8b 增加根据国标编号添加国标级联通道的接口 2023-09-21 21:34:02 +08:00
648540858 69d72e7e4e Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-20 09:15:57 +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
648540858 be527a4bd1 增加国标通道同步到资源管理 2023-09-19 17:55:13 +08:00
648540858 074dbd69a2 有哈u云台控制接口 2023-09-18 18:19:46 +08:00
648540858 df0b530ce4 统计代理结果返回 2023-09-18 07:53:49 +08:00
Cloud User bc431e4290 fix-use-source-ip-as-stream-ip 2023-09-15 22:39:08 +08:00
648540858 b902a659dc Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-15 14:30:51 +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 125f993f1d 取去除无用实现 2023-09-15 09:38:28 +08:00
648540858 da15dc908d Merge branch 'wvp-28181-2.0' into database-structure-optimization
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
2023-09-15 09:36:38 +08:00
648540858 2d423d9668 Merge branch 'xinchuang' into wvp-28181-2.0 2023-09-15 09:35:14 +08:00
648540858 1d8dd248a5 接口优化 2023-09-15 09:34:29 +08:00
chenzhangyue 54038486f4 generate @param 2023-09-12 20:23:14 +08:00
648540858 b1ec6c6dd6 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-12 15:33:41 +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 33debb002a Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-06 16:37:59 +08:00
648540858 d02078397e 修复修改流传输模式 2023-09-06 16:37:41 +08:00
648540858 c56a842194 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-06 16:18:33 +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 63e766eb75 修改接口名称 2023-09-01 09:22:46 +08:00