Commit Graph

  • 457c5e3821 修复拉流代理无人观看自动停用失败 648540858 2023-07-04 11:10:17 +0800
  • 9889f908c8 合并主线 648540858 2023-07-04 11:08:14 +0800
  • becea82736 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-04 10:10:48 +0800
  • 733a11f265 修复单端口点播 648540858 2023-07-03 17:55:34 +0800
  • 43ef195543 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-07-03 16:54:09 +0800
  • ba8fffd907 增加与第三方对接的接口 648540858 2023-07-03 16:53:03 +0800
  • e4622d17a6 优化字段名称 648540858 2023-07-03 10:36:02 +0800
  • 4604aaea99 优化语音对讲支持根据设备设置释放收到ACK后开始发流 648540858 2023-07-02 13:53:45 +0800
  • 3571ca272b Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-02 12:42:05 +0800
  • 27b125cf98 增加备用字段 648540858 2023-07-02 12:40:41 +0800
  • 64cd48a92b 增加备用字段 648540858 2023-07-02 00:03:21 +0800
  • 01bc6c857e
    Merge pull request #908 from cnless/wvp-28181-2.0 648540858 2023-07-01 23:04:39 +0800
  • 8237cd25af 修复添加拉流代理提交错误 648540858 2023-07-01 22:50:24 +0800
  • 228c57399a 修复打开分享页需要登陆的BUG 648540858 2023-07-01 22:14:53 +0800
  • c551164c89 合并主线 648540858 2023-07-01 18:33:42 +0800
  • 975ace051b Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-01 18:28:28 +0800
  • b64f320805 优化发流逻辑 648540858 2023-07-01 18:10:33 +0800
  • 74ad4235f1 修复tcp主动的推流 648540858 2023-07-01 13:01:56 +0800
  • fb90dfdac5 临时提交 648540858 2023-07-01 10:14:19 +0800
  • 1458014fe3 修复合并主线后语音对讲失败的问题 648540858 2023-06-30 15:24:07 +0800
  • c916433042 优化更新通道中父结点的判断 648540858 2023-06-30 10:34:02 +0800
  • 18ad50222f 优化更新通道中父结点的判断 648540858 2023-06-30 10:01:21 +0800
  • 2d4bbbea8e 优化更新通道的civicode判断 648540858 2023-06-29 17:10:14 +0800
  • c014a90cc6 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-06-29 16:08:05 +0800
  • 0592fd676f 修复使用推流状态作为推流通道状态为false仍然发送通知 648540858 2023-06-29 11:22:32 +0800
  • 7f0be280c3 修复未验证通过的表单被应该提交 648540858 2023-06-29 11:09:41 +0800
  • e8b766172e 合并268优化内容 648540858 2023-06-29 10:37:20 +0800
  • f62bf7b2c6 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-29 09:52:05 +0800
  • 1294081a9c 优化树形列表通道查询 648540858 2023-06-29 09:36:13 +0800
  • bfae9780f7 增加流关闭时的处理 648540858 2023-06-28 20:32:48 +0800
  • 9bd588957a 修复获取pushKey 648540858 2023-06-28 20:27:25 +0800
  • def56793ba 增加上级推流和停止推流的通知 648540858 2023-06-28 16:52:27 +0800
  • 639e0bab11 修复树形列表通道查询 648540858 2023-06-28 15:02:59 +0800
  • a77628e875 优化端口预占用,防止占用无法释放 648540858 2023-06-28 14:50:46 +0800
  • ed035b74d9 添加关闭收流发流的接口 648540858 2023-06-28 10:47:33 +0800
  • 6fcff0567e doc去除cdn依赖 648540858 2023-06-28 09:15:07 +0800
  • f961515317 合并主线 648540858 2023-06-27 17:18:46 +0800
  • 5a7a7a12bd Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-06-27 16:46:26 +0800
  • c7d1515023 增加redis通道 648540858 2023-06-27 15:34:38 +0800
  • 724963324a 修复上级点播时如果推流信息中mediaServerID错误的情况 648540858 2023-06-26 19:06:14 +0800
  • fec69c714c 优化国标信令 648540858 2023-06-25 22:40:26 +0800
  • 7749ea3421 新增接口超时时间配置,修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException dsk 2023-06-25 16:16:40 +0800
  • cec266d3cd 修复请求报错404等情况下导致ResponseBody未关闭的问题 dsk 2023-06-25 16:00:37 +0800
  • f306937616 优化自动获取stream ip 648540858 2023-06-25 13:49:07 +0800
  • 66eda32ab9 优化端口预占用 648540858 2023-06-25 10:18:29 +0800
  • 155838ce2e 优化子码流切换逻辑,去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 648540858 2023-06-22 22:35:35 +0800
  • f4e5e03962 修复表名错误 #904 648540858 2023-06-21 15:53:26 +0800
  • 7b24d51db9 优化国标级联的端口保持 648540858 2023-06-21 14:03:31 +0800
  • 3350b65259 添加文档依赖,去除cdn依赖 648540858 2023-06-20 15:25:56 +0800
  • 96d2a27d41 添加sql字段 648540858 2023-06-20 14:25:01 +0800
  • a7bf29a4cb 恢复默认值 648540858 2023-06-20 14:17:44 +0800
  • fa62ab9a01
    Merge pull request #893 from sxh-netizen/wvp-28181-2.0 648540858 2023-06-20 14:16:46 +0800
  • 9e28923b8c
    Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-06-20 14:15:27 +0800
  • b4dadf6c51 修复删除的设备无法重新注册的问题 648540858 2023-06-20 13:02:18 +0800
  • 21a96ad20f 修复通道刷新 648540858 2023-06-20 12:51:06 +0800
  • d310204d00 去除多余字段 648540858 2023-06-20 09:57:28 +0800
  • 0532363192 优化国标级联注册机制 648540858 2023-06-20 09:29:12 +0800
  • 6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-19 20:19:31 +0800
  • 8cf5b65e38 优化国标级联注册机制 648540858 2023-06-19 20:09:16 +0800
  • 8942ab0112 优化国标级联的目录创建以及推送规则,优化接收目录规则,更加规范 648540858 2023-06-19 18:42:36 +0800
  • ccc0a99d68 同步主线的代码,保持一致性 ‘sxh’ 2023-06-15 11:20:43 +0800
  • 652489b47e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 ‘sxh’ 2023-06-15 11:10:20 +0800
  • 05cc0d14f1 新增设备主子码流选择(mysql语句) ‘sxh’ 2023-06-15 11:04:04 +0800
  • 15df08964b 新增设备主子码流选择,默认为不开启 ‘sxh’ 2023-06-15 11:00:29 +0800
  • 319cdd2151 优化移动位置的时间 648540858 2023-06-14 20:39:10 +0800
  • 138216c395
    Merge pull request #876 from criver31/wvp-28181-2.0 648540858 2023-06-14 20:14:31 +0800
  • 74dedc2372 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 Leijie 2023-06-14 19:30:42 +0800
  • 9432342559 优先使用SIP认证用户名 Leijie 2023-06-14 19:26:51 +0800
  • 5b8ffd5b61 修复前端空指针异常 #831 648540858 2023-06-14 18:14:40 +0800
  • f4960b2618 修复移动位置获取接口超时 #857 648540858 2023-06-14 17:04:41 +0800
  • f3388dd53a 修复级联录像查询sql错误 648540858 2023-06-14 16:26:29 +0800
  • e68eb850a9 去除多余日志 648540858 2023-06-13 23:11:56 +0800
  • c4d7dd9651 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-13 23:11:00 +0800
  • 8f5bbfa5c2 修复zlm上线时过期任务设置错误 648540858 2023-06-13 23:06:35 +0800
  • fa80ba6f2b 修复sdp解析错误 648540858 2023-06-12 22:54:40 +0800
  • 52f9c295f9 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-06-10 00:33:00 +0800
  • 446f729e55 优化sdp解析,兼容带有f=的设备 648540858 2023-06-10 00:32:42 +0800
  • d93947c657
    Merge pull request #887 from bigbeef/wvp-28181-2.0 648540858 2023-06-09 23:18:15 +0800
  • 1bdc0621b8
    feat:删除拉流代理时,提示是否确认删除,防止误删 winfed 2023-06-09 15:50:33 +0800
  • a2d93fce81
    fix:修复拉流代理配置展示问题:音频、录制、无人观看 winfed 2023-06-09 15:19:18 +0800
  • 03f3598681 修复stream-on-demand配置失效的BUG 648540858 2023-06-08 22:46:07 +0800
  • 20a47729fc Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-08 10:41:36 +0800
  • 095b12ebbd 优化ffmpeg拉流代理 648540858 2023-06-08 10:40:16 +0800
  • ca715e0234 优化via的branch生成规则 648540858 2023-06-07 21:45:15 +0800
  • 0c14970ab8 增加收到notify增加或移除通道时发送redis消息 648540858 2023-06-07 21:11:39 +0800
  • 534be3f580 支持redis消息强制关闭流 648540858 2023-06-07 20:58:35 +0800
  • e272fa26e1 合并分支 648540858 2023-06-07 20:27:57 +0800
  • b7f2a6b25b Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-07 20:21:10 +0800
  • 97b04c4dba 修复录像下载,优化拉流代理接口 648540858 2023-06-07 20:15:08 +0800
  • 7a8edea181 实现注册流程 sip 648540858 2023-06-07 17:41:10 +0800
  • 508ee15066 增加sip会议视频接入能力 648540858 2023-06-07 15:29:52 +0800
  • a45fab423b 修复国标级联语音对讲 648540858 2023-06-05 15:01:20 +0800
  • db3240d918 优化截图获取接口 648540858 2023-06-05 11:10:15 +0800
  • 2ef4111297 修复拉流代理的ffmpeg代理方式 648540858 2023-06-05 10:28:11 +0800
  • b7d85a270e 修复添加目录SQL错误 #881 648540858 2023-06-05 09:39:59 +0800
  • 8d6de72429 优化日志 648540858 2023-06-02 16:40:19 +0800
  • 74431b1e98 优化点播流程中ssrc的释放 648540858 2023-06-02 15:46:07 +0800
  • dbdb9ca06d Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-06-01 15:58:33 +0800
  • 614eaa8f4f
    Merge pull request #872 from xu-bin-bin/wvp-28181-2.0 648540858 2023-06-01 15:58:19 +0800
  • 0c5b30e74f
    Merge pull request #878 from callinglove/wvp-28181-2.0 648540858 2023-06-01 14:55:14 +0800