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

859 Commits

Author SHA1 Message Date
648540858
60dffa5813 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-12-14 09:30:21 +08:00
648540858
b699158e43 修复点播流地址修改 2023-12-13 14:43:42 +08:00
648540858
94edd95824 Merge pull request #1205 from xu-bin-bin/wvp-28181-2.0 
修改输出的日志格式
 2023-12-13 14:31:06 +08:00
648540858
b4b9ad2873 修复写入事务信息callid错误 2023-12-13 09:40:30 +08:00
xubinbin
360fe689b1 增加日志记录时的完全限定类名，用于定位日志位置。 
ps：2023-12-12 16:30:58.779 [Thread-10]  INFO --- gov.nist.javax.sip.stack.UDPMessageChannel : 81 Done processing MESSAGE sip:44010200492000000003@4401020049 SIP/2.0
日志中的“gov.nist.javax.sip.stack.UDPMessageChannel”内容
 2023-12-12 16:41:15 +08:00
648540858
e73d00060e Merge pull request #1137 from xiaoQQya/develop 
bugfix: 修复推流鉴权、报警推送等问题
 2023-12-11 10:22:26 +08:00
xiaoQQya
f78657473e fix(报警推送): 修复报警推送功能无效的问题 
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
 2023-11-06 20:34:58 +08:00
lishuyuan
5cd2e2c41b bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加 2023-11-01 15:17:28 +08:00
648540858
6c13317faf Merge branch 'wvp-28181-2.0' into main-dev 2023-10-31 16:24:57 +08:00
lishuyuan
da7889bf67 bugfix：编辑国标设备时，若目录订阅周期本来不为0时不生效 2023-10-27 11:15:30 +08:00
lishuyuan
26ca854db5 bugfix：去掉目录订阅通知处理重复逻辑代码 2023-10-27 11:09:42 +08:00
648540858
7de73ebd2b Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
 2023-10-11 01:36:12 +08:00
648540858
205f1f1f60 优化国标级联心跳失败再次注册的逻辑 2023-10-08 15:41:24 +08:00
648540858
c084d6c98a 优化国标级联心跳失败判断逻辑 2023-10-07 18:00:08 +08:00
648540858
4c28f380aa 优化byte数组转换 2023-10-07 14:52:46 +08:00
648540858
130dc5d82d 优化拉流代理逻辑，修复ffmpeg拉流代理鉴权 2023-09-30 06:09:16 +08:00
648540858
483d5e04a7 优化拉流代理 2023-09-25 18:51:02 +08:00
648540858
5f50a3cfd9 修复语音对讲Bye消息的发送 2023-09-25 15:39:26 +08:00
648540858
b9a33f03d6 国标级联支持添加通道后主动推动到上级 2023-09-22 17:46:31 +08:00
648540858
4df90d9ba4 Merge branch 'wvp-28181-2.0' into main-dev 2023-09-20 09:17:28 +08:00
648540858
2d11f1b3de 修复ssrc缓存初始化判断错误，导致初始化失败 2023-09-15 14:25:08 +08:00
648540858
88350873ee Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.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/service/impl/MediaServerServiceImpl.java
 2023-09-11 11:21:50 +08:00
648540858
f57ed350b3 添加设置mobilePosition中ChannelId #1054 2023-09-11 11:01:20 +08:00
chenzhangyue
7155680793 fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set 2023-09-05 17:35:46 +08:00
648540858
cde7f6460a Merge pull request #999 from a24211317/wvp-28181-2.0 
解决两个国标平台相互级联时，上级不能获取目录的问题
 2023-09-01 09:21:05 +08:00
ChengHong
d0ef68af3f Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-08-31 17:08:13 +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
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
d9cfe061b9 优化对讲释放流程 2023-08-17 15:20:25 +08:00
648540858
983c7c351f 优化对讲释放流程 2023-08-17 14:20:04 +08:00
648540858
d4fdd975cc 优化对讲释放流程 2023-08-16 17:20:45 +08:00
648540858
4f26bd7176 优化级联语音对讲释放逻辑 2023-08-16 16:39:44 +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
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
fc9ed976cf 合并主线 2023-08-07 18:09:45 +08:00
648540858
e898c344aa Merge branch 'wvp-28181-2.0' into main-dev 
# 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/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2023-08-07 17:28:02 +08:00
648540858
470625e077 支持全局固定流地址 2023-08-07 17:00:01 +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
648540858
2e399faf41 修复gps位置更新时时间格式错误的问题 #971 2023-08-01 10:37:00 +08:00
648540858
4fbc364ab3 合并主线 2023-07-31 15:33:34 +08:00
648540858
3cada22743 Merge branch 'wvp-28181-2.0' into main-dev 
# 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/ZLMRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2023-07-31 15:28:47 +08:00