Commit Graph

  • 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
  • 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
  • b1ec6c6dd6 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-09-12 15:33:41 +0800
  • d05bce8f7f 修复对接金仓数据库中的问题 xinchuang 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
  • 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
  • 18aff4b546
    修复 #1058 davidche 2023-09-06 10:30:20 +0800
  • 33d4107d0c 修复启动时如果上机平台不可连接的导致的持续报错 648540858 2023-09-06 10:21:42 +0800
  • 1d0c9c6a31 fix set password chenzhangyue 2023-09-06 09:49:50 +0800
  • fd0ff18a71
    Merge pull request #1055 from lunasaw/dev-wvp-0905 648540858 2023-09-06 09:32:15 +0800
  • 0e9cb5ceb6
    Merge pull request #1048 from lunasaw/wvp-dev-0901 648540858 2023-09-06 09:31:43 +0800
  • 7155680793 fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set chenzhangyue 2023-09-05 17:35:46 +0800
  • 73f6f044a1 local dev chenzhangyue 2023-09-01 17:53:48 +0800
  • bf8fbf4927 bugfix:这里应该不存在key才初始化一次 chenzhangyue 2023-09-01 17:22:53 +0800
  • 63e766eb75 修改接口名称 648540858 2023-09-01 09:22:46 +0800
  • cde7f6460a
    Merge pull request #999 from a24211317/wvp-28181-2.0 648540858 2023-09-01 09:21:05 +0800
  • a426b9bc53
    Merge pull request #1036 from daniel10917/fix-channel-catalog 648540858 2023-09-01 09:19:55 +0800
  • 44aef5d358
    Merge pull request #1043 from xu-bin-bin/wvp-28181-2.0 648540858 2023-09-01 09:19:25 +0800
  • 393d25f739
    Merge pull request #1045 from lunasaw/wvp-dev-0830 648540858 2023-09-01 09:18:26 +0800
  • d38ccc257c 页面表单更新修复,这里update应该为查出来的DO,不是前端的DO,采用更安全的redis策略,更新DB删除缓存,查询设备的时候补充缓存 chenzhangyue 2023-08-31 17:36:57 +0800
  • d0ef68af3f
    Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 ChengHong 2023-08-31 17:08:13 +0800
  • e46f1ae915
    Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 xu-bin-bin 2023-08-31 16:51:06 +0800
  • 6f6764eda5 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-08-31 16:46:23 +0800
  • 9a64be46ba Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-31 16:42:01 +0800
  • d739017678 适配assist新的命名规则 648540858 2023-08-31 16:41:44 +0800
  • e8b2ca4686 将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产;剔除jwt token中包含的password和roleId,防止密码泄露。 xubinbin 2023-08-31 16:39:18 +0800
  • 32ec1cb912 增加通用通道接口 648540858 2023-08-31 09:45:51 +0800
  • a730fc904b 添加从国标通道同步的方法 648540858 2023-08-30 15:05:52 +0800
  • 1b81080f6f 修复通道目录同步异常问题 yangjunyi 2023-08-29 14:23:28 +0800
  • ebeaee419f 优化数据库查询速度 648540858 2023-08-28 15:03:58 +0800
  • dc37f66792
    Merge pull request #1028 from nikmu/wvp-28181-2.0 648540858 2023-08-28 09:03:58 +0800
  • 43fe078723 添加通道管理 648540858 2023-08-25 15:49:56 +0800
  • 288b4d4a41 Merge branch 'wvp-28181-2.0' into database-structure-optimization 648540858 2023-08-25 09:17:28 +0800
  • 760b14eaaa 恢复级联点播 648540858 2023-08-25 09:14:38 +0800
  • 4ae8c5ac3e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-25 09:14:07 +0800
  • 3951a95284 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-08-25 08:56:47 +0800
  • 23ce55260f 修复级联点播 648540858 2023-08-25 08:51:06 +0800
  • 49a8a08c94 捕获启动过程中发送sip异常导致的启动失败 朱俊杰 2023-08-24 17:12:39 +0800
  • 0701791902 添加资源管理 648540858 2023-08-24 16:15:58 +0800
  • ca89fe85b7 添加资源关联表sql 648540858 2023-08-21 17:58:17 +0800
  • dbe5b8f5a8 添加公用国标通道与sql 648540858 2023-08-21 17:54:15 +0800
  • 8fab1ed0e8
    Merge pull request #1017 from AlphaWu/Zafu-Dev-20230820 648540858 2023-08-21 09:29:56 +0800
  • b5ccb1636f 修正Database拼写错误。 AlphaWu 2023-08-20 15:50:24 +0800
  • 43a92588dc 构建标准国标目录信息 648540858 2023-08-18 17:58:29 +0800
  • b63a89a0a8 修复发流参数错误 648540858 2023-08-18 14:06:39 +0800
  • 69217c221f 构建标准国标目录信息 648540858 2023-08-18 12:20:40 +0800
  • d9cfe061b9 优化对讲释放流程 648540858 2023-08-17 15:20:25 +0800