Commit Graph

  • e5ac02ff17 增加接口 648540858 2023-11-01 09:25:49 +0800
  • 6c13317faf Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-10-31 16:24:57 +0800
  • 4ef1277c16 优化sql 648540858 2023-10-27 18:12:25 +0800
  • b7ad0a907f 合并pr 优化sql 648540858 2023-10-27 18:06:46 +0800
  • 829ff200b8 Merge branch 'wvp-28181-2.0' into wvp-28181-record 648540858 2023-10-27 16:01:07 +0800
  • f4f3e60a6b
    Merge pull request #1082 from DavidSche/Live_streaming_push 648540858 2023-10-27 15:47:27 +0800
  • f9abbc7fe8
    Merge pull request #1095 from AlphaWu/Zafu-Dev-20231001 648540858 2023-10-27 15:42:54 +0800
  • af911d4f02
    Merge pull request #1102 from xu-bin-bin/wvp-28181-2.0 648540858 2023-10-27 15:42:32 +0800
  • 47783946fe
    Merge pull request #1105 from lunasaw/dev-wvp-1011 648540858 2023-10-27 15:41:26 +0800
  • 8fd87b335d
    Merge pull request #1132 from shuxiaoyuan/fix-notify-catalog 648540858 2023-10-27 15:40:07 +0800
  • da7889bf67 bugfix:编辑国标设备时,若目录订阅周期本来不为0时不生效 lishuyuan 2023-10-27 11:15:30 +0800
  • 26ca854db5 bugfix:去掉目录订阅通知处理重复逻辑代码 lishuyuan 2023-10-27 11:09:42 +0800
  • a73508a24c 增加新的静态文件放过 648540858 2023-10-27 10:45:35 +0800
  • 99506108cd 添加日志 648540858 2023-10-26 15:29:04 +0800
  • e1d604a560 feat: 升级 Jessibuca 播放器到 2023-09-15 v3.1.36 版本,优化部分配置 xiaoQQya 2023-10-25 17:44:07 +0800
  • 5ff2faa5bd 添加日志 648540858 2023-10-25 15:02:15 +0800
  • 79f3ca9791 优化收藏功能 648540858 2023-10-25 14:45:45 +0800
  • cccfdace5b 优化sql 648540858 2023-10-25 10:11:33 +0800
  • e11671a1fb 优化sql 648540858 2023-10-24 18:20:24 +0800
  • ae9976bb3a
    Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 xu-bin-bin 2023-10-24 09:28:16 +0800
  • 16c056e338 优化云端录像转化 648540858 2023-10-23 17:59:27 +0800
  • 2bb7e23601
    Merge pull request #1119 from xiaoQQya/develop 648540858 2023-10-23 09:12:19 +0800
  • daac0010b1 优化云端录像定时清理 648540858 2023-10-19 17:52:19 +0800
  • 9b036fb71d 优化云端录像页面 648540858 2023-10-18 15:33:31 +0800
  • 92a25393f3 基于新的云端录像实现页面功能 648540858 2023-10-17 17:55:40 +0800
  • 613399cc6d fix(play): 修复单端口推流下级自定义 ssrc 时, 流注册后接口仍然超时的问题 xiaoQQya 2023-10-17 17:49:31 +0800
  • 5a75381a00 基于新的云端录像结构实现国标录像 648540858 2023-10-17 15:34:01 +0800
  • 90d9cd8ac8
    Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 xu-bin-bin 2023-10-17 09:23:45 +0800
  • 7aa8444e67 临时提交 648540858 2023-10-13 18:25:36 +0800
  • 14d5549876 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-10-13 15:47:22 +0800
  • 4d62f77025 Merge branch 'wvp-28181-2.0' into wvp-28181-record 648540858 2023-10-13 15:45:23 +0800
  • 12c4128e81 修复目录更新时已删除数据的整理功能 648540858 2023-10-13 15:44:49 +0800
  • e4d37864d1 开始重构云端录像继续 648540858 2023-10-13 15:26:51 +0800
  • 124d83fc0c
    Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 xu-bin-bin 2023-10-13 08:55:27 +0800
  • 298a9f4280 开始重构云端录像 648540858 2023-10-12 18:34:16 +0800
  • 2673fbb0bf Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-10-12 17:08:59 +0800
  • 78f628dd6f 修复同步目录时批量提交的错误 648540858 2023-10-12 17:01:25 +0800
  • 7d6aaf3bb0 修复国标接连选择通道相关的问题 648540858 2023-10-12 16:36:07 +0800
  • f5d89e06a3 feat:支持代理拉流状态检测,离线查询流是否离线 chenzhangyue 2023-10-11 13:52:08 +0800
  • 7443f2b123 修复目录名称修改,修复多层级目录删除,修复全部移除 648540858 2023-10-11 02:37:02 +0800
  • 7de73ebd2b Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-10-11 01:36:12 +0800
  • e45b443664 测试提交 648540858 2023-10-11 01:33:36 +0800
  • 4084080a8e 修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题。 xubinbin 2023-10-10 15:17:06 +0800
  • 89fd69b5ab 优化国标通道同步到资源库 648540858 2023-10-08 18:09:46 +0800
  • cb41fc9f84 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-10-08 15:42:08 +0800
  • 205f1f1f60 优化国标级联心跳失败再次注册的逻辑 648540858 2023-10-08 15:41:24 +0800
  • 9fa4bf6f77 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-10-08 11:04:30 +0800
  • c084d6c98a 优化国标级联心跳失败判断逻辑 648540858 2023-10-07 18:00:08 +0800
  • 4c28f380aa 优化byte数组转换 648540858 2023-10-07 14:52:46 +0800
  • 29352cc9cd 优化自动同步国标通道到通用通道,分组信息以及行政区划自动同步 648540858 2023-10-06 23:39:38 +0800
  • 215031e263 新增对录像辅助服务的ip配置支持 修正sql更新脚本中错误的语句 Samler 2023-10-04 03:15:43 +0800
  • 22f964f3f2 新增对录像辅助服务的ip配置支持 Samler 2023-10-04 03:15:43 +0800
  • 6255e6f89f 支持自动同步国标通道到通用通道,分组信息以及行政区划自动同步 648540858 2023-10-04 00:59:16 +0800
  • 8f7673a083 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-10-01 23:59:04 +0800
  • f6c1ce15e4 修复数据库脚本的BUG。 AlphaWu 2023-10-01 12:29:48 +0800
  • 94a0de0d27 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-09-30 06:09:57 +0800
  • 130dc5d82d 优化拉流代理逻辑,修复ffmpeg拉流代理鉴权 648540858 2023-09-30 06:09:16 +0800
  • 32f1a0aa6e
    Merge pull request #1094 from lunasaw/wvp-dev-0928 648540858 2023-09-29 06:24:59 +0800
  • 7620527340 fix hasSubChannel chenzhangyue 2023-09-28 16:00:05 +0800
  • e2f0533510 添加字段控制是否自动同步国标通道 648540858 2023-09-26 15:39:52 +0800
  • 483d5e04a7 优化拉流代理 648540858 2023-09-25 18:51:02 +0800
  • 527dd66c0d 添加字段控制是否自动同步国标通道 648540858 2023-09-25 18:20:05 +0800
  • e8411bc797 修复截图截图未关闭流 #1087 648540858 2023-09-25 16:22:36 +0800
  • ea271bf4b9 添加字段控制是否自动同步国标通道 648540858 2023-09-25 16:13:38 +0800
  • 5f50a3cfd9 修复语音对讲Bye消息的发送 648540858 2023-09-25 15:39:26 +0800
  • 94ec880fe8 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-09-22 17:46:58 +0800
  • b9a33f03d6 国标级联支持添加通道后主动推动到上级 648540858 2023-09-22 17:46:31 +0800
  • da63ef5b19 推流列表-->添加通道 补充播放需要的默认参数 媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示) che_shuai 2023-09-22 11:34:10 +0800
  • 37915522d7 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-09-22 09:43:59 +0800
  • a34db2ee8b 增加根据国标编号添加国标级联通道的接口 648540858 2023-09-21 21:34:02 +0800
  • 4df90d9ba4 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-09-20 09:17:28 +0800
  • 69d72e7e4e Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-09-20 09:15:57 +0800
  • 4ba0e3c13e
    Merge pull request #1077 from binban/fix-use-source-ip-as-stream-ip 648540858 2023-09-20 09:14:48 +0800
  • be527a4bd1 增加国标通道同步到资源管理 648540858 2023-09-19 17:55:13 +0800
  • 074dbd69a2 有哈u云台控制接口 648540858 2023-09-18 18:19:46 +0800
  • df0b530ce4 统计代理结果返回 648540858 2023-09-18 07:53:49 +0800
  • bc431e4290 fix-use-source-ip-as-stream-ip Cloud User 2023-09-15 22:39:08 +0800
  • b902a659dc Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-09-15 14:30:51 +0800
  • e073b60cb1
    Merge pull request #1071 from lunasaw/dev-wvp-0911 648540858 2023-09-15 14:29:01 +0800
  • 2d11f1b3de 修复ssrc缓存初始化判断错误,导致初始化失败 648540858 2023-09-15 14:25:08 +0800
  • 125f993f1d 取去除无用实现 648540858 2023-09-15 09:38:28 +0800
  • da15dc908d Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-09-15 09:36:38 +0800
  • 2d423d9668 Merge branch 'xinchuang' into wvp-28181-2.0 648540858 2023-09-15 09:35:14 +0800
  • 1d8dd248a5 接口优化 648540858 2023-09-15 09:34:29 +0800
  • 54038486f4 generate @param chenzhangyue 2023-09-12 20:23:14 +0800
  • 2252205dcc generate @param chenzhangyue 2023-09-12 20:19:34 +0800
  • b1ec6c6dd6 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-09-12 15:33:41 +0800
  • d05bce8f7f 修复对接金仓数据库中的问题 648540858 2023-09-12 15:32:17 +0800
  • a6fb1cdb74 修复Web页面播放国标录像无声音的问题 648540858 2023-09-11 16:17:29 +0800
  • 88350873ee Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-09-11 11:21:50 +0800
  • f57ed350b3 添加设置mobilePosition中ChannelId #1054 648540858 2023-09-11 11:01:20 +0800
  • 4f90b28b93 修复自动点播超时后无法继续点播的问题 648540858 2023-09-11 10:36:40 +0800
  • c38ffe3786 code review chenzhangyue 2023-09-10 17:55:58 +0800
  • 0222a1e70d Merge branch 'wvp-28181-2.0' into dev-wvp-0906 chenzhangyue 2023-09-10 17:49:28 +0800
  • f5f768a247 code review chenzhangyue 2023-09-10 17:47:54 +0800
  • 33debb002a Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-09-06 16:37:59 +0800
  • d02078397e 修复修改流传输模式 648540858 2023-09-06 16:37:41 +0800
  • c56a842194 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-09-06 16:18:33 +0800
  • 212218c7c4
    Merge pull request #1057 from lunasaw/dev-wvp-0906 648540858 2023-09-06 10:32:24 +0800
  • 3cdede80f9
    Merge pull request #1059 from DavidSche/fix_#1058 648540858 2023-09-06 10:32:15 +0800