Commit Graph

2006 Commits (4897d9a50162973f6dae491b131a45a98de7969f)

Author SHA1 Message Date
648540858 4897d9a501 临时提交 2023-12-06 18:18:24 +08:00
648540858 2199db079a Merge remote-tracking branch 'origin/database-structure-optimization' into database-structure-optimization
# Conflicts:
#	sql/common.sql
2023-12-06 16:13:27 +08:00
648540858 0d3845af59 添加移除共享到上级平台的通道 2023-12-05 23:23:48 +08:00
648540858 c4aeef62ef 调整数据库结构 2023-12-04 21:56:21 +08:00
648540858 628bffd21a 优化数据库表结构 2023-11-30 17:40:53 +08:00
648540858 e44be505d9 优化通用通道同步,待完成 2023-11-28 18:56:39 +08:00
648540858 5a5108c827 优化通用通道同步,待完成 2023-11-27 18:40:00 +08:00
648540858 d88c635d8a 优化通用通道同步,待完成 2023-11-27 11:04:43 +08:00
648540858 a9e5883492 优化通用通道同步,待完成 2023-11-24 18:04:57 +08:00
648540858 d72f57c772 支持通用通道国标类型的播放 2023-11-24 10:12:36 +08:00
648540858 cbc0ca91b1 优化区域树 2023-11-17 17:59:14 +08:00
648540858 b96c9317e8 优化区域树 2023-11-16 14:24:50 +08:00
648540858 7d064b0830 优化区域树 2023-11-15 18:04:59 +08:00
648540858 fd71a96580 优化分组树 2023-11-15 11:24:56 +08:00
648540858 bcd5ce25ca 优化分组树 2023-11-14 18:36:40 +08:00
648540858 4ab0200c90 修复BUG 2023-11-10 17:58:40 +08:00
648540858 abbb5643c5 优化分组树的添加 2023-11-10 17:41:20 +08:00
648540858 e96b39935d 支持生成国标ID 2023-11-10 16:03:47 +08:00
648540858 fed353c645 优化分组管理 2023-11-09 18:05:30 +08:00
648540858 6fb820e49c 修复分组更新BUG 2023-11-08 18:30:41 +08:00
648540858 2f9bd859f4 修复通道查询BUG 2023-11-07 18:27:57 +08:00
648540858 887f20524f 优化分组管理 2023-11-03 17:20:00 +08:00
648540858 e5ac02ff17 增加接口 2023-11-01 09:25:49 +08:00
648540858 a73508a24c 增加新的静态文件放过 2023-10-27 10:45:35 +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
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
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