Commit Graph

  • 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
  • b70d14d336 页面表单更新修复,这里update应该为查出来的DO,不是前端的DO,采用更安全的redis策略,更新DB删除缓存,查询设备的时候补充缓存 chenzhangyue 2023-08-31 17:31:11 +0800
  • 5459742aaa Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-dev-0831 chenzhangyue 2023-08-31 17:27:37 +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
  • 8ef8cf69e2 冗余代码优化 chenzhangyue 2023-08-23 16:28:04 +0800
  • d80a7844c4 冗余代码优化 chenzhangyue 2023-08-23 15:36:27 +0800
  • ca89fe85b7 添加资源关联表sql 648540858 2023-08-21 17:58:17 +0800
  • dbe5b8f5a8 添加公用国标通道与sql 648540858 2023-08-21 17:54:15 +0800
  • 7c3765a357 实现对ZLM全部HOOK的支持. AlphaWu 2023-08-21 15:42:25 +0800
  • 42cfa4aaef 实现对ZLM全部HOOK的支持. AlphaWu 2023-08-21 13:29:50 +0800
  • a9202bd004 修正字符串拼接错误 AlphaWu 2023-08-21 11:29:23 +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
  • 983c7c351f 优化对讲释放流程 648540858 2023-08-17 14:20:04 +0800
  • d4fdd975cc 优化对讲释放流程 648540858 2023-08-16 17:20:45 +0800
  • 4f26bd7176 优化级联语音对讲释放逻辑 648540858 2023-08-16 16:39:44 +0800
  • 985082d339 添加缺少的内容 648540858 2023-08-16 09:11:22 +0800
  • 9d56da5680 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-16 01:57:39 +0800
  • 676a722241 修复心跳异常,支持通道列表,推流列表,拉流代理列表直接查看对应的云端录像,兼容大于INT的ssrc的格式化 648540858 2023-08-16 01:56:34 +0800
  • 91e49745e4 修复心跳异常,支持通道列表,推流列表,拉流代理列表直接查看对应的云端录像,兼容大于INT的ssrc的格式化 648540858 2023-08-11 09:12:19 +0800
  • bd41451d60 优化国标级联语音对讲流程 6485840858 2023-08-15 10:41:12 +0800
  • bac19f583c 解决两个国标平台相互级联时,上级不能获取目录的问题 chenghong 2023-08-14 11:44:41 +0800
  • eefd6a0e21
    Merge pull request #993 from a24211317/wvp-28181-2.0 648540858 2023-08-11 09:12:19 +0800
  • 66a76eadd5
    Merge pull request #996 from lunasaw/dev-0810 648540858 2023-08-11 09:11:50 +0800
  • dd2ae65786 修复代理访问跨域问题,和ScheduledFuture取消任务时指令重排异常,不结束正在运行的任务。防止 Command interrupted chenzhangyue 2023-08-10 20:00:43 +0800
  • dfd7566274 redis 允许正在进行的任务完成 chenzhangyue 2023-08-10 19:18:49 +0800
  • 8e34d4e4cb fix chenzhangyue 2023-08-10 19:12:29 +0800
  • 44e26d2024 fix chenzhangyue 2023-08-10 18:02:42 +0800
  • 2f4862d573 fix chenzhangyue 2023-08-10 17:02:18 +0800
  • 5053659d8c fix chenzhangyue 2023-08-10 16:16:23 +0800
  • 066c42fd02 设备上线初始化心跳时间 chenzhangyue 2023-08-10 15:37:32 +0800
  • 02e0e6b610 心跳通知 chenzhangyue 2023-08-10 14:56:32 +0800
  • 206f99b640 进行通道离线,ZML代理跨域 chenzhangyue 2023-08-10 14:25:59 +0800
  • 15fd6c920e 代理assist 跨域 chenzhangyue 2023-08-10 10:14:33 +0800
  • cb461df619 Merge branch 'wvp-28181-2.0' into dev-0801 chenzhangyue 2023-08-10 10:07:39 +0800
  • 4ca97d3174 平台保活消息增加回复200OK chenghong 2023-08-09 16:18:19 +0800
  • 9c33a7ef10 git temp chenzhangyue 2023-08-09 10:59:17 +0800
  • 6106bda151 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-08-08 16:06:39 +0800
  • d67f0a1ea4 解决使用redis集群时获取发送端口失败的问题 648540858 2023-08-08 16:06:02 +0800
  • 5e34039def 支持对接第三方PS流 648540858 2023-08-08 10:01:51 +0800
  • 3e2486d0ab Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-08-08 09:50:31 +0800
  • 874a57387a 支持与第三方对接PS流 648540858 2023-08-08 09:49:27 +0800
  • fc9ed976cf 合并主线 648540858 2023-08-07 18:09:45 +0800
  • e898c344aa Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-08-07 17:28:02 +0800
  • 0aada74b70 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-07 17:04:11 +0800
  • 470625e077 支持全局固定流地址 648540858 2023-08-07 17:00:01 +0800
  • 4d9d697e40 fix(play): 修复单端口推流下级自定义 ssrc 时, 点播超时事务未找到的问题 xiaoQQya 2023-08-07 15:21:28 +0800
  • 527c1bd076 合并最新代码 xiaoQQya 2023-08-07 13:37:35 +0800
  • 6905f00293
    Merge pull request #989 from dodu2014/wvp-28181-2.0-1 648540858 2023-08-07 10:05:13 +0800
  • f60494d641
    Update config.md dodu2014 2023-08-07 09:55:19 +0800
  • fa13b22819 invite消息缓存字符间隔改为使用:代替_,避免scan查询失败 648540858 2023-08-04 17:53:12 +0800
  • 4a34097b68 录像下载不使用固定地址 648540858 2023-08-04 16:41:29 +0800
  • 988dc36fa5 重构点播,回放,下载时ssrc不一致以及TCP主动播放的逻辑 648540858 2023-08-04 15:47:56 +0800
  • ba884fa9ef 默认关闭ssrc check 648540858 2023-08-03 16:08:22 +0800
  • a01086fe1c 修复tcp主动录像回放时ssrc不一致时点播失败的问题 648540858 2023-08-03 15:50:15 +0800
  • 6797f77259 优化点播超时的处理,修复tcp主动点播时ssrc不一致时点播失败的问题 648540858 2023-08-03 15:36:59 +0800
  • 7079c73b99 修复空指针异常 648540858 2023-08-03 09:52:47 +0800
  • 273ade5f73 fix(play): 修复单端口推流下级自定义 ssrc 时, ssrc 修正不完全的问题 xiaoQQya 2023-08-02 13:56:07 +0800
  • 0bf0bb2ab7 code run chenzhangyue 2023-08-01 16:29:10 +0800
  • 2e399faf41 修复gps位置更新时时间格式错误的问题 #971 648540858 2023-08-01 10:37:00 +0800
  • bf1be52e7f Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2023-08-01 10:29:20 +0800
  • e5cba6022f Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-08-01 10:28:41 +0800
  • a4b15e84d7
    Merge pull request #978 from dodu2014/wvp-28181-2.0 648540858 2023-08-01 09:47:14 +0800
  • 735df5a935 docs: 修正日志管理控制器mapping的错误描述 tnt group 2023-08-01 08:27:47 +0800
  • a44adcab43
    Merge pull request #976 from dodu2014/wvp-28181-2.0 648540858 2023-07-31 17:01:10 +0800