Commit Graph

  • dbf92b96b0 添加TODO 后续实现删除空了的过期日期文件夹 648540858 2023-11-27 14:21:40 +08:00
  • ffc8a530f3 修复定时录像删除 648540858 2023-11-24 10:47:33 +08:00
  • 29ef68038d 优化拉流代理中关于ffmpeg.cmd的判断 648540858 2023-11-21 14:50:16 +08:00
  • db24f49275 定时删除过期录像的时间设置 648540858 2023-11-21 14:32:35 +08:00
  • c98ef23b98 修复定时删除过期录像文件时,收藏文件被删除的问题 648540858 2023-11-21 14:30:33 +08:00
  • fc8bb378de Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-11-21 10:50:02 +08:00
  • 8422d3a343 添加数据库链接参数 648540858 2023-11-21 10:49:29 +08:00
  • 9a572b97df 修复OnStreamChangedHook媒体轨道信息解析错误 dongzhou.xie 2023-11-07 11:23:17 +08:00
  • a30ff222ec fix(player): 修复分屏页面视频无法自动播放的问题 xiaoQQya 2023-11-07 09:37:40 +08:00
  • f78657473e fix(报警推送): 修复报警推送功能无效的问题 xiaoQQya 2023-11-06 20:34:58 +08:00
  • 8d7d751d44 perf(pom.xml): 移除重复依赖,升级部分已知有漏洞的依赖版本 xiaoQQya 2023-11-06 16:11:31 +08:00
  • b73747138d Merge branch '648540858:wvp-28181-2.0' into develop xiaoQQya 2023-11-06 15:43:07 +08:00
  • c1bc45fe8f 修复点播接口状态判断错误 648540858 2023-11-06 15:13:58 +08:00
  • a01295603a 简化配置 648540858 2023-11-03 17:32:37 +08:00
  • 58b333604d 修改错别字 648540858 2023-11-02 15:30:17 +08:00
  • 073b6acec3 取出多余注释 648540858 2023-11-02 15:25:39 +08:00
  • f36eb7ebeb 添加打包文件 648540858 2023-11-02 14:17:20 +08:00
  • 8bd2f47c9a bugfix:目录订阅收到更新事件时,sql字段update_time为空导致的报错 lishuyuan 2023-11-02 10:17:47 +08:00
  • f0d09d1808 perf(snap): 优化点播后 ffmpeg 截图使用的命令参数,解决部分情况下截图失败的问题 xiaoQQya 2023-11-01 17:15:19 +08:00
  • 8a9f8c6cab fix: 修复推流鉴权时 enable_audio 设置错误的问题 xiaoQQya 2023-11-01 16:04:12 +08:00
  • 84c78be91c sql重命名为数据库 648540858 2023-11-01 15:36:35 +08:00
  • 5cd2e2c41b bugfix:设备地址变化会引起目录订阅任务失效,需要重新添加 lishuyuan 2023-11-01 15:17:28 +08:00
  • 5d3f307b44 将录像存储路径迁移至wvp中配置,assist以有在需要视频合成的时候才会用 648540858 2023-11-01 14:07:32 +08:00
  • 941b9a8374 Merge branch '648540858:wvp-28181-2.0' into develop xiaoQQya 2023-11-01 13:44:14 +08:00
  • 75fccfaf17 使用zlm原生接口删除录像文件 648540858 2023-11-01 10:45:36 +08:00
  • 6c13317faf Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-10-31 16:24:57 +08:00
  • 4ef1277c16 优化sql 648540858 2023-10-27 18:12:25 +08:00
  • b7ad0a907f 合并pr 优化sql 648540858 2023-10-27 18:06:46 +08:00
  • 829ff200b8 Merge branch 'wvp-28181-2.0' into wvp-28181-record 648540858 2023-10-27 16:01:07 +08:00
  • f4f3e60a6b Merge pull request #1082 from DavidSche/Live_streaming_push 648540858 2023-10-27 15:47:27 +08:00
  • f9abbc7fe8 Merge pull request #1095 from AlphaWu/Zafu-Dev-20231001 648540858 2023-10-27 15:42:54 +08:00
  • af911d4f02 Merge pull request #1102 from xu-bin-bin/wvp-28181-2.0 648540858 2023-10-27 15:42:32 +08:00
  • 47783946fe Merge pull request #1105 from lunasaw/dev-wvp-1011 648540858 2023-10-27 15:41:26 +08:00
  • 8fd87b335d Merge pull request #1132 from shuxiaoyuan/fix-notify-catalog 648540858 2023-10-27 15:40:07 +08:00
  • da7889bf67 bugfix:编辑国标设备时,若目录订阅周期本来不为0时不生效 lishuyuan 2023-10-27 11:15:30 +08:00
  • 26ca854db5 bugfix:去掉目录订阅通知处理重复逻辑代码 lishuyuan 2023-10-27 11:09:42 +08:00
  • 99506108cd 添加日志 648540858 2023-10-26 15:29:04 +08:00
  • e1d604a560 feat: 升级 Jessibuca 播放器到 2023-09-15 v3.1.36 版本,优化部分配置 xiaoQQya 2023-10-25 17:44:07 +08:00
  • 5ff2faa5bd 添加日志 648540858 2023-10-25 15:02:15 +08:00
  • 79f3ca9791 优化收藏功能 648540858 2023-10-25 14:45:45 +08:00
  • cccfdace5b 优化sql 648540858 2023-10-25 10:11:33 +08:00
  • e11671a1fb 优化sql 648540858 2023-10-24 18:20:24 +08:00
  • ae9976bb3a Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 xu-bin-bin 2023-10-24 09:28:16 +08:00
  • 16c056e338 优化云端录像转化 648540858 2023-10-23 17:59:27 +08:00
  • 2bb7e23601 Merge pull request #1119 from xiaoQQya/develop 648540858 2023-10-23 09:12:19 +08:00
  • daac0010b1 优化云端录像定时清理 648540858 2023-10-19 17:52:19 +08:00
  • 9b036fb71d 优化云端录像页面 648540858 2023-10-18 15:33:31 +08:00
  • 92a25393f3 基于新的云端录像实现页面功能 648540858 2023-10-17 17:55:40 +08:00
  • 613399cc6d fix(play): 修复单端口推流下级自定义 ssrc 时, 流注册后接口仍然超时的问题 xiaoQQya 2023-10-17 17:49:31 +08:00
  • 5a75381a00 基于新的云端录像结构实现国标录像 648540858 2023-10-17 15:34:01 +08:00
  • 90d9cd8ac8 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 xu-bin-bin 2023-10-17 09:23:45 +08:00
  • 7aa8444e67 临时提交 648540858 2023-10-13 18:25:36 +08:00
  • 14d5549876 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-10-13 15:47:22 +08:00
  • 4d62f77025 Merge branch 'wvp-28181-2.0' into wvp-28181-record 648540858 2023-10-13 15:45:23 +08:00
  • 12c4128e81 修复目录更新时已删除数据的整理功能 648540858 2023-10-13 15:44:49 +08:00
  • e4d37864d1 开始重构云端录像继续 648540858 2023-10-13 15:26:51 +08:00
  • 124d83fc0c Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 xu-bin-bin 2023-10-13 08:55:27 +08:00
  • 298a9f4280 开始重构云端录像 648540858 2023-10-12 18:34:16 +08:00
  • 2673fbb0bf Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-10-12 17:08:59 +08:00
  • 78f628dd6f 修复同步目录时批量提交的错误 648540858 2023-10-12 17:01:25 +08:00
  • 7d6aaf3bb0 修复国标接连选择通道相关的问题 648540858 2023-10-12 16:36:07 +08:00
  • f5d89e06a3 feat:支持代理拉流状态检测,离线查询流是否离线 chenzhangyue 2023-10-11 13:52:08 +08:00
  • 7443f2b123 修复目录名称修改,修复多层级目录删除,修复全部移除 648540858 2023-10-11 02:37:02 +08:00
  • 7de73ebd2b Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-10-11 01:36:12 +08:00
  • e45b443664 测试提交 648540858 2023-10-11 01:33:36 +08:00
  • 4084080a8e 修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题。 xubinbin 2023-10-10 15:17:06 +08:00
  • 205f1f1f60 优化国标级联心跳失败再次注册的逻辑 648540858 2023-10-08 15:41:24 +08:00
  • c084d6c98a 优化国标级联心跳失败判断逻辑 648540858 2023-10-07 18:00:08 +08:00
  • 4c28f380aa 优化byte数组转换 648540858 2023-10-07 14:52:46 +08:00
  • f6c1ce15e4 修复数据库脚本的BUG。 AlphaWu 2023-10-01 12:29:48 +08:00
  • 94a0de0d27 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-09-30 06:09:57 +08:00
  • 130dc5d82d 优化拉流代理逻辑,修复ffmpeg拉流代理鉴权 648540858 2023-09-30 06:09:16 +08:00
  • 32f1a0aa6e Merge pull request #1094 from lunasaw/wvp-dev-0928 648540858 2023-09-29 06:24:59 +08:00
  • 7620527340 fix hasSubChannel chenzhangyue 2023-09-28 16:00:05 +08:00
  • 483d5e04a7 优化拉流代理 648540858 2023-09-25 18:51:02 +08:00
  • e8411bc797 修复截图截图未关闭流 #1087 648540858 2023-09-25 16:22:36 +08:00
  • 5f50a3cfd9 修复语音对讲Bye消息的发送 648540858 2023-09-25 15:39:26 +08:00
  • b9a33f03d6 国标级联支持添加通道后主动推动到上级 648540858 2023-09-22 17:46:31 +08:00
  • da63ef5b19 推流列表-->添加通道 补充播放需要的默认参数 媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示) che_shuai 2023-09-22 11:34:10 +08:00
  • a34db2ee8b 增加根据国标编号添加国标级联通道的接口 648540858 2023-09-21 21:34:02 +08:00
  • 4df90d9ba4 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-09-20 09:17:28 +08:00
  • 4ba0e3c13e Merge pull request #1077 from binban/fix-use-source-ip-as-stream-ip 648540858 2023-09-20 09:14:48 +08:00
  • bc431e4290 fix-use-source-ip-as-stream-ip Cloud User 2023-09-15 22:39:08 +08:00
  • e073b60cb1 Merge pull request #1071 from lunasaw/dev-wvp-0911 648540858 2023-09-15 14:29:01 +08:00
  • 2d11f1b3de 修复ssrc缓存初始化判断错误,导致初始化失败 648540858 2023-09-15 14:25:08 +08:00
  • 2d423d9668 Merge branch 'xinchuang' into wvp-28181-2.0 648540858 2023-09-15 09:35:14 +08:00
  • 54038486f4 generate @param chenzhangyue 2023-09-12 20:23:14 +08:00
  • d05bce8f7f 修复对接金仓数据库中的问题 648540858 2023-09-12 15:32:17 +08:00
  • a6fb1cdb74 修复Web页面播放国标录像无声音的问题 648540858 2023-09-11 16:17:29 +08:00
  • 88350873ee Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-09-11 11:21:50 +08:00
  • f57ed350b3 添加设置mobilePosition中ChannelId #1054 648540858 2023-09-11 11:01:20 +08:00
  • 4f90b28b93 修复自动点播超时后无法继续点播的问题 648540858 2023-09-11 10:36:40 +08:00
  • d02078397e 修复修改流传输模式 648540858 2023-09-06 16:37:41 +08:00
  • 212218c7c4 Merge pull request #1057 from lunasaw/dev-wvp-0906 648540858 2023-09-06 10:32:24 +08:00
  • 3cdede80f9 Merge pull request #1059 from DavidSche/fix_#1058 648540858 2023-09-06 10:32:15 +08:00
  • 18aff4b546 修复 #1058 davidche 2023-09-06 10:30:20 +08:00
  • 33d4107d0c 修复启动时如果上机平台不可连接的导致的持续报错 648540858 2023-09-06 10:21:42 +08:00
  • 1d0c9c6a31 fix set password chenzhangyue 2023-09-06 09:49:50 +08:00
  • fd0ff18a71 Merge pull request #1055 from lunasaw/dev-wvp-0905 648540858 2023-09-06 09:32:15 +08:00
  • 0e9cb5ceb6 Merge pull request #1048 from lunasaw/wvp-dev-0901 648540858 2023-09-06 09:31:43 +08:00