648540858
|
78f628dd6f
|
修复同步目录时批量提交的错误
|
2023-10-12 17:01:25 +08:00 |
|
648540858
|
7d6aaf3bb0
|
修复国标接连选择通道相关的问题
|
2023-10-12 16:36:07 +08:00 |
chenzhangyue
|
f5d89e06a3
|
feat:支持代理拉流状态检测，离线查询流是否离线
|
2023-10-11 13:52:08 +08:00 |
|
648540858
|
7443f2b123
|
修复目录名称修改，修复多层级目录删除，修复全部移除
|
2023-10-11 02:37:02 +08:00 |
|
648540858
|
7de73ebd2b
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
|
2023-10-11 01:36:12 +08:00 |
|
648540858
|
e45b443664
|
测试提交
|
2023-10-11 01:33:36 +08:00 |
xubinbin
|
4084080a8e
|
修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题。
|
2023-10-10 15:17:06 +08:00 |
|
648540858
|
89fd69b5ab
|
优化国标通道同步到资源库
|
2023-10-08 18:09:46 +08:00 |
|
648540858
|
cb41fc9f84
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-10-08 15:42:08 +08:00 |
|
648540858
|
205f1f1f60
|
优化国标级联心跳失败再次注册的逻辑
|
2023-10-08 15:41:24 +08:00 |
|
648540858
|
9fa4bf6f77
|
Merge branch 'wvp-28181-2.0' into database-structure-optimization
|
2023-10-08 11:04:30 +08:00 |
|
648540858
|
c084d6c98a
|
优化国标级联心跳失败判断逻辑
|
2023-10-07 18:00:08 +08:00 |
|
648540858
|
4c28f380aa
|
优化byte数组转换
|
2023-10-07 14:52:46 +08:00 |
|
648540858
|
29352cc9cd
|
优化自动同步国标通道到通用通道，分组信息以及行政区划自动同步
|
2023-10-06 23:39:38 +08:00 |
|
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
|
5f50a3cfd9
|
修复语音对讲Bye消息的发送
|
2023-09-25 15:39:26 +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
|
4df90d9ba4
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-09-20 09:17:28 +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 |