XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,976 Commits 2 Branches 0 Tags
f78657473e85487c09cd3c10112db48a0c4a7c4e
Commit Graph

379 Commits

Author SHA1 Message Date
xiaoQQya
f78657473e fix(报警推送): 修复报警推送功能无效的问题 
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
 2023-11-06 20:34:58 +08:00
648540858
130dc5d82d 优化拉流代理逻辑，修复ffmpeg拉流代理鉴权 2023-09-30 06:09:16 +08:00
648540858
483d5e04a7 优化拉流代理 2023-09-25 18:51:02 +08:00
648540858
e8411bc797 修复截图截图未关闭流 #1087 2023-09-25 16:22:36 +08:00
648540858
a34db2ee8b 增加根据国标编号添加国标级联通道的接口 2023-09-21 21:34:02 +08:00
Cloud User
bc431e4290 fix-use-source-ip-as-stream-ip 2023-09-15 22:39:08 +08:00
xubinbin
e8b2ca4686 将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。 2023-08-31 16:39:18 +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
AlphaWu
b5ccb1636f 修正Database拼写错误。 2023-08-20 15:50:24 +08:00
648540858
b63a89a0a8 修复发流参数错误 2023-08-18 14:06: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
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
988dc36fa5 重构点播，回放，下载时ssrc不一致以及TCP主动播放的逻辑 2023-08-04 15:47:56 +08:00
648540858
6797f77259 优化点播超时的处理，修复tcp主动点播时ssrc不一致时点播失败的问题 2023-08-03 15:36:59 +08:00
648540858
bf1be52e7f Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-08-01 10:29:20 +08:00
tnt group
735df5a935 docs: 修正日志管理控制器mapping的错误描述 2023-08-01 08:27:47 +08:00
648540858
095a3e1384 移除无用代码 2023-07-31 12:26:42 +08:00
tnt group
e9a48e5303 fix: 修复请求截图api生成文件名称的异常 2023-07-30 13:25:38 +08:00
648540858
17ea37506e 修复端口分配的并发问题 2023-07-24 09:06:49 +08:00
648540858
d48f89eee4 修复端口分配的并发问题 2023-07-24 09:04:47 +08:00
648540858
9cd63f0105 修复国标级联时添加目录不同平台无法使用同一个目录的问题 2023-07-19 15:33:21 +08:00
648540858
32c73ff595 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-07-17 16:56:58 +08:00
朱俊杰
4f2cd41134 修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突 2023-07-17 10:54:34 +08:00
648540858
c42d391290 修复数据存储 2023-07-14 08:34:15 +08:00
648540858
ef5018de2d 修复合并错误 2023-07-13 14:57:30 +08:00
648540858
668dc8f0dd Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
 2023-07-13 14:47:24 +08:00
648540858
9fc3db1f5e 增加发流音视频分开发送 2023-07-13 14:30:41 +08:00
648540858
f525b55729 修复发流复盖的为问题 2023-07-12 15:13:53 +08:00
648540858
04e7f48fde 合并主线的发流端口管理逻辑 2023-07-10 14:30:59 +08:00
648540858
885842249f 优化第三方对接接口 2023-07-07 18:17:24 +08:00
648540858
ff1e9f79c2 优化海康发送的Message消息设置的消息体长度为0，导致无法解析的问题 #920 2023-07-07 14:51:41 +08:00
648540858
61e5226122 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
 2023-07-06 15:07:43 +08:00
648540858
0a3d25fb5b 修复非必传参数 2023-07-06 15:07:16 +08:00
648540858
457c5e3821 修复拉流代理无人观看自动停用失败 2023-07-04 11:10:17 +08:00
648540858
733a11f265 修复单端口点播 2023-07-03 17:55:34 +08:00
648540858
43ef195543 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
 2023-07-03 16:54:09 +08:00
648540858
ba8fffd907 增加与第三方对接的接口 2023-07-03 16:53:03 +08:00
648540858
e4622d17a6 优化字段名称 2023-07-03 10:36:02 +08:00
648540858
f62bf7b2c6 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
 2023-06-29 09:52:05 +08:00
648540858
ed035b74d9 添加关闭收流发流的接口 2023-06-28 10:47:33 +08:00
648540858
6fcff0567e doc去除cdn依赖 2023-06-28 09:15:07 +08:00
648540858
c7d1515023 增加redis通道 2023-06-27 15:34:38 +08:00
648540858
f306937616 优化自动获取stream ip 2023-06-25 13:49:07 +08:00
648540858
155838ce2e 优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 2023-06-22 22:35:35 +08:00