XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 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
  • 7155680793 fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set chenzhangyue 2023-09-05 17:35:46 +08:00
  • 73f6f044a1 local dev chenzhangyue 2023-09-01 17:53:48 +08:00
  • bf8fbf4927 bugfix:这里应该不存在key才初始化一次 chenzhangyue 2023-09-01 17:22:53 +08:00
  • cde7f6460a Merge pull request #999 from a24211317/wvp-28181-2.0 648540858 2023-09-01 09:21:05 +08:00
  • a426b9bc53 Merge pull request #1036 from daniel10917/fix-channel-catalog 648540858 2023-09-01 09:19:55 +08:00
  • 44aef5d358 Merge pull request #1043 from xu-bin-bin/wvp-28181-2.0 648540858 2023-09-01 09:19:25 +08:00
  • 393d25f739 Merge pull request #1045 from lunasaw/wvp-dev-0830 648540858 2023-09-01 09:18:26 +08:00
  • d38ccc257c 页面表单更新修复，这里update应该为查出来的DO，不是前端的DO，采用更安全的redis策略，更新DB删除缓存，查询设备的时候补充缓存 chenzhangyue 2023-08-31 17:36:57 +08:00
  • d0ef68af3f Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 ChengHong 2023-08-31 17:08:13 +08:00
  • e46f1ae915 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 xu-bin-bin 2023-08-31 16:51:06 +08:00
  • 9a64be46ba Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-31 16:42:01 +08:00
  • d739017678 适配assist新的命名规则 648540858 2023-08-31 16:41:44 +08:00
  • e8b2ca4686 将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。 xubinbin 2023-08-31 16:39:18 +08:00
  • 1b81080f6f 修复通道目录同步异常问题 yangjunyi 2023-08-29 14:23:28 +08:00
  • dc37f66792 Merge pull request #1028 from nikmu/wvp-28181-2.0 648540858 2023-08-28 09:03:58 +08:00
  • 760b14eaaa 恢复级联点播 648540858 2023-08-25 09:14:38 +08:00
  • 4ae8c5ac3e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-25 09:14:07 +08:00
  • 3951a95284 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-08-25 08:56:47 +08:00
  • 23ce55260f 修复级联点播 648540858 2023-08-25 08:51:06 +08:00
  • 49a8a08c94 捕获启动过程中发送sip异常导致的启动失败 朱俊杰 2023-08-24 17:12:39 +08:00
  • 8fab1ed0e8 Merge pull request #1017 from AlphaWu/Zafu-Dev-20230820 648540858 2023-08-21 09:29:56 +08:00
  • b5ccb1636f 修正Database拼写错误。 AlphaWu 2023-08-20 15:50:24 +08:00
  • b63a89a0a8 修复发流参数错误 648540858 2023-08-18 14:06:39 +08:00
  • d9cfe061b9 优化对讲释放流程 648540858 2023-08-17 15:20:25 +08:00
  • 983c7c351f 优化对讲释放流程 648540858 2023-08-17 14:20:04 +08:00
  • d4fdd975cc 优化对讲释放流程 648540858 2023-08-16 17:20:45 +08:00
  • 4f26bd7176 优化级联语音对讲释放逻辑 648540858 2023-08-16 16:39:44 +08:00
  • 985082d339 添加缺少的内容 648540858 2023-08-16 09:11:22 +08:00
  • 9d56da5680 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-16 01:57:39 +08:00
  • 676a722241 修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化 648540858 2023-08-16 01:56:34 +08:00
  • 91e49745e4 修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化 648540858 2023-08-11 09:12:19 +08:00
  • bd41451d60 优化国标级联语音对讲流程 6485840858 2023-08-15 10:41:12 +08:00
  • bac19f583c 解决两个国标平台相互级联时，上级不能获取目录的问题 chenghong 2023-08-14 11:44:41 +08:00
  • eefd6a0e21 Merge pull request #993 from a24211317/wvp-28181-2.0 648540858 2023-08-11 09:12:19 +08:00
  • 66a76eadd5 Merge pull request #996 from lunasaw/dev-0810 648540858 2023-08-11 09:11:50 +08:00
  • dd2ae65786 修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted chenzhangyue 2023-08-10 20:00:43 +08:00
  • 4ca97d3174 平台保活消息增加回复200OK chenghong 2023-08-09 16:18:19 +08:00
  • 6106bda151 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-08-08 16:06:39 +08:00
  • d67f0a1ea4 解决使用redis集群时获取发送端口失败的问题 648540858 2023-08-08 16:06:02 +08:00
  • 5e34039def 支持对接第三方PS流 648540858 2023-08-08 10:01:51 +08:00
  • 3e2486d0ab Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-08-08 09:50:31 +08:00
  • 874a57387a 支持与第三方对接PS流 648540858 2023-08-08 09:49:27 +08:00
  • fc9ed976cf 合并主线 648540858 2023-08-07 18:09:45 +08:00
  • e898c344aa Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-08-07 17:28:02 +08:00
  • 0aada74b70 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-07 17:04:11 +08:00
  • 470625e077 支持全局固定流地址 648540858 2023-08-07 17:00:01 +08:00
  • 6905f00293 Merge pull request #989 from dodu2014/wvp-28181-2.0-1 648540858 2023-08-07 10:05:13 +08:00
  • f60494d641 Update config.md dodu2014 2023-08-07 09:55:19 +08:00
  • fa13b22819 invite消息缓存字符间隔改为使用:代替_,避免scan查询失败 648540858 2023-08-04 17:53:12 +08:00
  • 4a34097b68 录像下载不使用固定地址 648540858 2023-08-04 16:41:29 +08:00
  • 988dc36fa5 重构点播，回放，下载时ssrc不一致以及TCP主动播放的逻辑 648540858 2023-08-04 15:47:56 +08:00
  • ba884fa9ef 默认关闭ssrc check 648540858 2023-08-03 16:08:22 +08:00
  • a01086fe1c 修复tcp主动录像回放时ssrc不一致时点播失败的问题 648540858 2023-08-03 15:50:15 +08:00
  • 6797f77259 优化点播超时的处理，修复tcp主动点播时ssrc不一致时点播失败的问题 648540858 2023-08-03 15:36:59 +08:00
  • 7079c73b99 修复空指针异常 648540858 2023-08-03 09:52:47 +08:00
  • 2e399faf41 修复gps位置更新时时间格式错误的问题 #971 648540858 2023-08-01 10:37:00 +08:00
  • bf1be52e7f Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-01 10:29:20 +08:00
  • e5cba6022f Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-08-01 10:28:41 +08:00
  • a4b15e84d7 Merge pull request #978 from dodu2014/wvp-28181-2.0 648540858 2023-08-01 09:47:14 +08:00
  • 735df5a935 docs: 修正日志管理控制器mapping的错误描述 tnt group 2023-08-01 08:27:47 +08:00
  • 6275372455 添加service 648540858 2023-07-31 17:34:44 +08:00
  • a44adcab43 Merge pull request #976 from dodu2014/wvp-28181-2.0 648540858 2023-07-31 17:01:10 +08:00
  • 3de49d1c2a 优化发流逻辑 648540858 2023-07-31 16:42:12 +08:00
  • 4fbc364ab3 合并主线 648540858 2023-07-31 15:33:34 +08:00
  • 3cada22743 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-31 15:28:47 +08:00
  • 095a3e1384 移除无用代码 648540858 2023-07-31 12:26:42 +08:00
  • e9a48e5303 fix: 修复请求截图api生成文件名称的异常 tnt group 2023-07-30 13:25:38 +08:00
  • 59d8f2f915 支持录像回放使用固定流地址以及自动点播录像回放 648540858 2023-07-25 11:14:43 +08:00
  • 51634b1b96 Merge pull request #965 from wanghui0961/wvp-28181-2.0 648540858 2023-07-25 10:14:06 +08:00
  • a4f6102a4f Merge pull request #964 from DavidSche/wvp-28181-2.0 648540858 2023-07-25 10:13:24 +08:00