648540858
|
3cdede80f9
|
Merge pull request #1059 from DavidSche/fix_#1058
修复 #1058 错误
|
2023-09-06 10:32:15 +08:00 |
|
davidche
|
18aff4b546
|
修复 #1058
|
2023-09-06 10:30:20 +08:00 |
|
648540858
|
33d4107d0c
|
修复启动时如果上机平台不可连接的导致的持续报错
|
2023-09-06 10:21:42 +08:00 |
|
648540858
|
fd0ff18a71
|
Merge pull request #1055 from lunasaw/dev-wvp-0905
fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set
|
2023-09-06 09:32:15 +08:00 |
|
648540858
|
0e9cb5ceb6
|
Merge pull request #1048 from lunasaw/wvp-dev-0901
bugfix:这里应该不存在key才初始化一次
|
2023-09-06 09:31:43 +08:00 |
|
chenzhangyue
|
7155680793
|
fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set
|
2023-09-05 17:35:46 +08:00 |
|
chenzhangyue
|
73f6f044a1
|
local dev
|
2023-09-01 17:53:48 +08:00 |
|
chenzhangyue
|
bf8fbf4927
|
bugfix:这里应该不存在key才初始化一次
|
2023-09-01 17:22:53 +08:00 |
|
648540858
|
cde7f6460a
|
Merge pull request #999 from a24211317/wvp-28181-2.0
解决两个国标平台相互级联时，上级不能获取目录的问题
|
2023-09-01 09:21:05 +08:00 |
|
648540858
|
a426b9bc53
|
Merge pull request #1036 from daniel10917/fix-channel-catalog
修复通道目录同步异常问题
|
2023-09-01 09:19:55 +08:00 |
|
648540858
|
44aef5d358
|
Merge pull request #1043 from xu-bin-bin/wvp-28181-2.0
将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。
|
2023-09-01 09:19:25 +08:00 |
|
648540858
|
393d25f739
|
Merge pull request #1045 from lunasaw/wvp-dev-0830
code review
|
2023-09-01 09:18:26 +08:00 |
|
chenzhangyue
|
d38ccc257c
|
页面表单更新修复，这里update应该为查出来的DO，不是前端的DO，采用更安全的redis策略，更新DB删除缓存，查询设备的时候补充缓存
|
2023-08-31 17:36:57 +08:00 |
|
ChengHong
|
d0ef68af3f
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2023-08-31 17:08:13 +08:00 |
|
xu-bin-bin
|
e46f1ae915
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2023-08-31 16:51:06 +08:00 |
|
648540858
|
9a64be46ba
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-08-31 16:42:01 +08:00 |
|
648540858
|
d739017678
|
适配assist新的命名规则
|
2023-08-31 16:41:44 +08:00 |
|
xubinbin
|
e8b2ca4686
|
将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。
|
2023-08-31 16:39:18 +08:00 |
|
yangjunyi
|
1b81080f6f
|
修复通道目录同步异常问题
|
2023-08-29 14:23:28 +08:00 |
|
648540858
|
dc37f66792
|
Merge pull request #1028 from nikmu/wvp-28181-2.0
捕获启动过程中发送sip异常导致的启动失败
|
2023-08-28 09:03:58 +08:00 |
|
648540858
|
760b14eaaa
|
恢复级联点播
|
2023-08-25 09:14:38 +08:00 |
|
648540858
|
4ae8c5ac3e
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-08-25 09:14:07 +08:00 |
|
648540858
|
3951a95284
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2023-08-25 08:56:47 +08:00 |
|
648540858
|
23ce55260f
|
修复级联点播
|
2023-08-25 08:51:06 +08:00 |
|
朱俊杰
|
49a8a08c94
|
捕获启动过程中发送sip异常导致的启动失败
|
2023-08-24 17:12:39 +08:00 |
|
648540858
|
8fab1ed0e8
|
Merge pull request #1017 from AlphaWu/Zafu-Dev-20230820
修正Database拼写错误。
|
2023-08-21 09:29:56 +08:00 |
|
AlphaWu
|
b5ccb1636f
|
修正Database拼写错误。
|
2023-08-20 15:50:24 +08:00 |
|
648540858
|
b63a89a0a8
|
修复发流参数错误
|
2023-08-18 14:06:39 +08:00 |
|
648540858
|
985082d339
|
添加缺少的内容
|
2023-08-16 09:11:22 +08:00 |
|
648540858
|
9d56da5680
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-08-16 01:57:39 +08:00 |
|
648540858
|
676a722241
|
修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化
|
2023-08-16 01:56:34 +08:00 |
|
648540858
|
91e49745e4
|
修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化
|
2023-08-16 01:55:50 +08:00 |
|
chenghong
|
bac19f583c
|
解决两个国标平台相互级联时，上级不能获取目录的问题
|
2023-08-14 11:44:41 +08:00 |
|
648540858
|
eefd6a0e21
|
Merge pull request #993 from a24211317/wvp-28181-2.0
平台保活消息增加回复200OK
|
2023-08-11 09:12:19 +08:00 |
|
648540858
|
66a76eadd5
|
Merge pull request #996 from lunasaw/dev-0810
修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted
|
2023-08-11 09:11:50 +08:00 |
|
chenzhangyue
|
dd2ae65786
|
修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted
|
2023-08-10 20:00:43 +08:00 |
|
chenghong
|
4ca97d3174
|
平台保活消息增加回复200OK
|
2023-08-09 16:18:19 +08:00 |
|
648540858
|
6106bda151
|
Merge branch '2.6.8' into wvp-28181-2.0
|
2023-08-08 16:06:39 +08:00 |
|
648540858
|
d67f0a1ea4
|
解决使用redis集群时获取发送端口失败的问题
|
2023-08-08 16:06:02 +08:00 |
|
648540858
|
5e34039def
|
支持对接第三方PS流
|
2023-08-08 10:01:51 +08:00 |
|
648540858
|
3e2486d0ab
|
Merge branch '2.6.8' into wvp-28181-2.0
|
2023-08-08 09:50:31 +08:00 |
|
648540858
|
874a57387a
|
支持与第三方对接PS流
|
2023-08-08 09:49:27 +08:00 |
|
648540858
|
0aada74b70
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2023-08-07 17:04:11 +08:00 |
|
648540858
|
470625e077
|
支持全局固定流地址
|
2023-08-07 17:00:01 +08:00 |
|
648540858
|
6905f00293
|
Merge pull request #989 from dodu2014/wvp-28181-2.0-1
Update config.md
|
2023-08-07 10:05:13 +08:00 |
|
dodu2014
|
f60494d641
|
Update config.md
修复文档错别字
|
2023-08-07 09:55:19 +08:00 |
|
648540858
|
fa13b22819
|
invite消息缓存字符间隔改为使用:代替_,避免scan查询失败
|
2023-08-04 17:53:12 +08:00 |
|
648540858
|
4a34097b68
|
录像下载不使用固定地址
|
2023-08-04 16:41:29 +08:00 |
|
648540858
|
988dc36fa5
|
重构点播，回放，下载时ssrc不一致以及TCP主动播放的逻辑
|
2023-08-04 15:47:56 +08:00 |
|
648540858
|
ba884fa9ef
|
默认关闭ssrc check
|
2023-08-03 16:08:22 +08:00 |
|