Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,159 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

2330 Commits (3331a7d931164acf9ae6e8c462e1cfec75cf1d9d)

Author SHA1 Message Date
648540858 bb609b7e09 临时提交 2024-07-10 10:51:35 +08:00
panlinlin e73fb64283 临时提交 2024-07-10 00:12:45 +08:00
panlinlin aa9397ca21 临时提交 2024-07-10 00:07:01 +08:00
648540858 61b811e701 临时提交 2024-07-09 18:00:44 +08:00
648540858 046e7802f3 临时提交 2024-07-09 17:55:51 +08:00
648540858 2235caca36 临时提交 2024-07-08 18:00:44 +08:00
648540858 4912ce16ec 临时提交 2024-07-08 17:44:35 +08:00
ZhaoYandong00 d1af677fff
修复在docker中使用，平台信息IP无法显示主机IP的问题 
配置sip,showip用来显示主机IP
 2024-07-08 16:34:29 +08:00
648540858 7b7512f84d 临时提交 2024-07-08 15:10:02 +08:00
648540858 fe921b860a Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/resources/application.yml
 2024-07-08 14:09:48 +08:00
648540858 cf5ca3afb9 修复设备断网导致超时的空指针异常 2024-07-08 11:40:37 +08:00
panlinlin 052bbf16c3 临时提交 2024-07-07 07:28:54 +08:00
648540858 52aa4e6e85 实现GbChannelServiceImpl 2024-07-05 17:22:21 +08:00
648540858 1cb1b0bd36 临时提交 2024-07-04 18:00:41 +08:00
648540858 7936194718 调整数据库字段 2024-07-04 16:55:42 +08:00
648540858 b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858 adf040ec4b 优化日志以及属性设置代码 2024-07-03 17:09:49 +08:00
648540858 799932f614 优化日志以及属性设置代码 2024-07-03 16:14:18 +08:00
648540858 10c852c00d 优化目录信息内容构建 2024-07-02 16:35:03 +08:00
648540858 324fef2908 临时提交 2024-07-01 17:59:14 +08:00
648540858 2c7dfa03a8 适配拉流代理 2024-07-01 17:13:12 +08:00
648540858 d1df17c007 适配拉流代理 2024-07-01 17:12:43 +08:00
panlinlin e531e497c8 临时提交 2024-06-29 23:35:26 +08:00
panlinlin 69e7ab5439 临时提交 2024-06-29 12:01:42 +08:00
panlinlin 97bc8766bc 临时提交 2024-06-28 22:15:42 +08:00
648540858 b630190e30 临时提交 2024-06-28 18:06:09 +08:00
panlinlin 019af90f6e 临时提交 2024-06-28 07:36:28 +08:00
panlinlin 9c0e69c6c5 临时提交 2024-06-28 06:48:49 +08:00
panlinlin 7847bd6614 临时提交 2024-06-27 23:38:13 +08:00
648540858 88c021948f 临时提交 2024-06-27 18:41:58 +08:00
648540858 b2aa5c839d 临时提交 2024-06-27 17:51:13 +08:00
648540858 400eef2d2e 临时提交 2024-06-27 16:02:43 +08:00
648540858 1616a2a731 Merge remote-tracking branch 'gitee-c/dev/master-通道结构重构' into dev/master-通道结构重构 2024-06-26 18:41:37 +08:00
648540858 f32eb14125 临时提交 2024-06-26 18:36:32 +08:00
648540858 81049b5a9e 临时提交 2024-06-25 17:46:33 +08:00
648540858 7255e5a887 临时提交 2024-06-25 16:59:22 +08:00
648540858 e4c11bfebe Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-06-25 16:46:47 +08:00
648540858 68fce9177f 临时提交 2024-06-25 16:45:31 +08:00
648540858 87c071fd5e 合并271分支 2024-06-25 10:24:35 +08:00
648540858 57a230afb3 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
 2024-06-25 09:45:34 +08:00
panlinlin 397ac956de 调整通用通道的位置 2024-06-21 16:05:13 +08:00
648540858 050882d6a6 修复推流时存入推流数据的问题 2024-06-20 22:35:48 +08:00
648540858 306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00
648540858 246c01b1c8 重命名通道信息 2024-06-20 20:49:17 +08:00
648540858 40bf2d6642 添加通道信息 2024-06-20 20:24:15 +08:00
648540858 e0c957a0c5 Merge branch 'refs/heads/master' into dev/master-通道结构重构 2024-06-20 20:06:01 +08:00
648540858 5e82aa5f39 优化拉流代理国标级联点播 2024-06-20 20:04:48 +08:00
648540858 5c40608458 临时提交 2024-06-20 20:04:29 +08:00
648540858 45410d8091 优化拉流代理国标级联点播 2024-06-20 19:46:48 +08:00
648540858 099c65ff40 调整点播默认超时时间为10秒 2024-06-20 19:30:25 +08:00
648540858 6e4268a670 调整推流数据写入redis 2024-06-20 18:12:35 +08:00
648540858 f5abf8df4c 修改排序 2024-06-19 16:00:26 +08:00
648540858 afe80a7be1 调整获取监听信息的逻辑 2024-06-18 10:00:32 +08:00
648540858 1909c7f71f 调整参数名称 2024-06-17 10:08:09 +08:00
648540858 b1d9ea8082
Merge pull request #1492 from iwanlebron/master 
修复参数名称
 2024-06-17 10:06:51 +08:00
648540858 107caf1171 调整前端使用转码后的流 2024-06-14 17:24:57 +08:00
648540858 f3ea07bdcd 调整转码后的流的输出位置 2024-06-14 17:03:55 +08:00
648540858 aa56bb3c26 优化docker内ip变化的情况 2024-06-14 09:47:19 +08:00
panlinlin 07a8ef9e25 SIP只有一个监听时，直接返回 2024-06-14 00:03:57 +08:00
panlinlin 70e6d919e9 设备使用的注册网卡信息变化时，更新设备信息 2024-06-13 23:40:32 +08:00
panlinlin 7b46769a16 修复国标录像下载后负载统计未清除的BUG 2024-06-13 23:15:51 +08:00
648540858 da2662ab27 国标28181-支持自动识别网卡监听，可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858 4ad711f61a 去除调试日志日志 2024-06-13 16:21:34 +08:00
648540858 c1b0365b02 增加设备上线判断双逻辑，兼容华为设备（前一条的描述大华是错误的，大华没有这个问题）注册后不再发送注册的设备 2024-06-12 11:16:21 +08:00
648540858 6c9d213394 Merge remote-tracking branch 'origin/master' 2024-06-12 11:10:22 +08:00
648540858 0ac27b03ff 增加设备上线判断双逻辑，兼容大华注册后不再发送注册的设备 2024-06-12 11:10:10 +08:00
panlinlin b070b57259 拉流代理状态变化时，支持推送到国标平台 2024-06-11 23:10:12 +08:00
648540858 2cf7178cb7 Merge branch 'refs/heads/2.7.1' 2024-06-11 10:14:14 +08:00
648540858 f8ef14bfea 修复移动位置位置订阅上报间隔为0的bug 2024-06-11 10:08:13 +08:00
Iwan Lebron f6157cc42c
修复参数名称 2024-06-10 09:18:37 +08:00
wangxinlong 208e034822 录像下载失败未正常释放ssrc 2024-06-07 18:13:45 +08:00
648540858 619a86e0ed 修复循环引用 2024-06-06 19:59:48 +08:00
648540858 2226d34898 修复空指针异常 2024-06-06 00:29:52 +08:00
648540858 2127cbeca3 调整收到移动位置订阅后开启定时任务 2024-06-05 22:45:13 +08:00
648540858 764d04b497 调整上级观看消息的发送 2024-05-29 15:02:51 +08:00
648540858 bec35ebf94 调整录像进度获取流程 2024-05-28 16:06:08 +08:00
648540858 c69b64c756 修复CSEQ重置错误 #1449 2024-05-28 10:23:17 +08:00
648540858 de390d3982 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2024-05-28 10:16:46 +08:00
648540858 1efabbe4cc 支持把推流的额外参数加入redis缓存 2024-05-24 10:50:29 +08:00
648540858 3a056acbc1 合并271分支 2024-05-24 10:18:29 +08:00
648540858 de6baa157e 合并271分支 2024-05-24 08:51:09 +08:00
648540858 8bdc406903 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
 2024-05-24 08:50:14 +08:00
648540858 aeeb61d141 合并271分支 2024-05-23 17:47:43 +08:00
648540858 475b8a49a3 优化录像文件信息入库 2024-05-23 17:44:30 +08:00
648540858 2c89fae49a Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
 2024-05-23 17:32:15 +08:00
648540858 fe9b8154e0 去除调试日志 2024-05-23 17:15:14 +08:00
648540858 2daa59d78c 支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题 2024-05-23 17:10:45 +08:00
648540858 d70bfb53dd 修复兼容zlm-pro转码时无人管看自动移除失败的BUG 2024-05-20 11:37:07 +08:00
648540858 49101a37e0 兼容zlm-pro转码 2024-05-17 16:32:01 +08:00
bradyx 6e8071d820 fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。 2024-05-15 13:52:16 +08:00
648540858 5564cfb384 优化大量notify 移动位置订阅的入库 2024-05-13 17:22:36 +08:00
648540858 588b1da35a Merge branch 'refs/heads/2.7.0' into 271-优化notify存储 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
 2024-05-13 11:12:20 +08:00
BradyXu 72b437cc52 修复当上级平台点播时，上级平台和下级平台局域网不通时，导致推流失败。推流目标IP地址改为配置的SDP发流IP，如果SDP发流IP存在的话。否则还是从连接中获取推流目标IP 2024-05-12 02:15:41 +08:00
648540858 e6a850891e 支持移动位置订阅通知的数据存储 2024-05-11 17:48:47 +08:00
648540858 17e9631de4 修复多节点时端口丢失的问题 2024-05-09 23:53:36 +08:00
648540858 632075da9b 优化接收BYE消息后的处理 2024-05-09 23:41:27 +08:00
648540858 622d72b3f0 解决刷新通道异常 2024-05-08 12:16:18 +08:00
648540858 186b00e9b3 支持下载多个云端录像的zip压缩包 2024-05-08 11:18:47 +08:00
648540858 2ae4226e89 修复云端录像按年月查询时时间条件错误的BUG 2024-04-30 15:45:39 +08:00
648540858 edfd528dd5 Merge remote-tracking branch 'origin/master' 2024-04-30 15:01:43 +08:00
648540858 d4cdf5510b 优化拉流代理调用流程 2024-04-30 14:39:53 +08:00
WuPeng 424c0b6333 修改on_stream_none_reader返回值 2024-04-28 14:31:38 +08:00
648540858 8ade012a6e 合并分支 2024-04-26 17:49:28 +08:00
648540858 5e359b64d6 合并分支 2024-04-26 17:41:00 +08:00
648540858 6bd3a187a0 合并分支 2024-04-26 15:42:31 +08:00
648540858 3f6ef955f5 修复空指针异常 2024-04-26 15:02:49 +08:00
648540858 39c3274294 合并分支 2024-04-25 17:53:24 +08:00
648540858 b89af9a693 Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2024-04-24 20:51:28 +08:00
648540858 2113e8cf27 优化notify消息中目录的处理 2024-04-24 20:33:52 +08:00
648540858 44aa37ad6e 优化notify消息中目录的处理 2024-04-24 16:12:42 +08:00
648540858 c21d973977 修复收到catalog消息是更新导致是否有音频的设置失效的BUG 2024-04-24 14:59:41 +08:00
648540858 1a30992985 合并270 2024-04-24 09:11:53 +08:00
648540858 d41d6b34af Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
#	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/ByeRequestProcessor.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/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-04-23 20:59:20 +08:00
648540858 66a681d679 优化notify消息中目录和移动位置的处理 2024-04-23 20:45:12 +08:00
648540858 901dee2bf4 修复转发国标notify-update时信息错误的问题 2024-04-23 10:12:00 +08:00
648540858 8cba63642f 优化notify消息处理 2024-04-22 20:29:36 +08:00
648540858 b57dbeac13 优化通道更新 2024-04-20 18:58:53 +08:00
648540858 1aa197510f 临时提交 2024-04-19 14:39:35 +08:00
648540858 87629b7fc7 临时提交 2024-04-19 10:32:28 +08:00
648540858 0d0b31f715 临时提交 2024-04-19 10:27:24 +08:00
648540858 0dab86f0b8 临时提交 2024-04-19 10:22:34 +08:00
648540858 94436de3e1 临时提交 2024-04-18 18:31:37 +08:00
648540858 73559cc6b3 临时提交 2024-04-18 18:19:27 +08:00
648540858 38ce529dd2 临时提交 2024-04-18 18:14:59 +08:00
648540858 678bb33562 临时提交 2024-04-18 18:07:47 +08:00
648540858 5d36c2a337 临时提交 2024-04-18 17:51:56 +08:00
648540858 9adf12ca6a 临时提交 2024-04-18 17:34:00 +08:00
648540858 3639d2224d 临时提交 2024-04-18 17:22:25 +08:00
648540858 f536123b11 修改toString方法 2024-04-18 17:05:03 +08:00
648540858 2a765a93eb 添加RedisRpcResponse的toString 2024-04-18 17:00:13 +08:00
648540858 6025eb29fd 添加注释 2024-04-18 16:30:21 +08:00
648540858 55a240bb45 临时提交 2024-04-18 15:52:34 +08:00
648540858 407a5edebf 优化多wvp国标级联推流时推流信息的清理 2024-04-17 23:31:48 +08:00
648540858 e85cef4345 优化多wvp国标级联推流时缓存的清理 2024-04-17 23:23:42 +08:00
648540858 313243195e 修复通道位置的展示 2024-04-17 17:56:36 +08:00
648540858 bf6e09d231 修复多wvp国标级联机制 2024-04-17 12:56:22 +08:00
648540858 f357bece62 优化回调设置方式 2024-04-16 22:22:00 +08:00
648540858 9c6765d44e 重构多wvp国标级联机制 2024-04-16 22:10:35 +08:00
648540858 b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858 f9abfca003 临时提交 2024-04-15 21:33:22 +08:00
648540858 cdeb3acf7c 移除多余文件 2024-04-15 16:13:56 +08:00
648540858 bd0fafde81 修复目录订阅发送订阅未携带经纬度的问题 2024-04-15 15:51:10 +08:00
648540858 f34143df6d 修改totalReaderCount类型 2024-04-12 10:36:18 +08:00
648540858 da54cdf3b8 解决空指针异常 2024-04-12 09:00:39 +08:00
648540858 5c0183a422 修复无法下载较长时间时间录像的BUG 2024-04-11 22:25:57 +08:00
648540858 8750f0f3dd 去除多余代码 2024-04-11 16:58:56 +08:00
648540858 ab20f76885 去除多余代码 2024-04-11 16:58:03 +08:00
648540858 e222095636 修复流数据写入缓存 2024-04-11 16:55:34 +08:00
648540858 651d4a1b0e 优化代码调用 2024-04-11 14:28:42 +08:00
648540858 9978d30aa1 Merge branch '2.7.0' 2024-04-11 09:36:48 +08:00
648540858 b45d71ba6d
Merge pull request #1389 from ancienter/develop-add-api-key 
[add]新增ApiKey管理功能
 2024-04-10 22:56:14 +08:00
648540858 f458c9b793 优化代码调用 2024-04-10 22:38:12 +08:00
leesam ce950dea4a Merge branch 'refs/heads/master' into develop-add-api-key 2024-04-10 22:18:40 +08:00
leesam 53199b32f6 适配postgres数据库 2024-04-10 22:16:56 +08:00
648540858 6c0087db88 优化代码调用 2024-04-10 20:56:45 +08:00
leesam 16b7e4a7ef Merge branch 'refs/heads/master' into develop-add-api-key 2024-04-10 20:49:44 +08:00
leesam 10e2180c72 [bugfix]支持context-path配置 2024-04-10 19:07:37 +08:00
648540858 9bb5ef6522 修复多个wvp执行推流转发失败的BUG 2024-04-10 18:22:42 +08:00
648540858 82ca3a778a 优化媒体节点redis数据格式 2024-04-09 22:52:06 +08:00
648540858 54b878d2e1 优化代码，升级版本号为2.7.1 2024-04-09 22:43:45 +08:00
648540858 cf8320e749
Merge pull request #1400 from Anyuei/master 
处理可能会出现的空指针异常
 2024-04-09 20:57:50 +08:00
648540858 a1861038e5 修复录像下载 2024-04-09 19:53:43 +08:00
648540858 7a59acc8e6 合并主线 2024-04-09 17:30:18 +08:00
648540858 de5d025cee 修复单端口收流时音频禁用失败的问题 2024-04-09 16:10:02 +08:00
648540858 ab318fcf70 修复点播错误时关闭rtpserver 2024-04-09 14:53:11 +08:00
648540858 6dd870e74c 修复点播端口为空 2024-04-09 10:59:59 +08:00
648540858 bbf19c7909 合并主线 2024-04-09 10:40:16 +08:00
648540858 b1b6fae22c Merge branch 'master' into dev/zlm 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
 2024-04-09 10:35:11 +08:00
648540858 0b2f635176 移除非主线内容 2024-04-09 10:30:00 +08:00
ancienter 25ff2fc4ef
Merge branch '648540858:master' into develop-add-api-key 2024-04-09 09:52:23 +08:00
648540858 a890b62fa1 Merge branch '2.7.0' 2024-04-08 18:13:33 +08:00
648540858 48351c875e 国标级联支持制定200OK中sdp的IP 2024-04-08 18:13:15 +08:00
648540858 7d0aebd311 Merge branch '2.7.0' 2024-04-07 20:26:01 +08:00
648540858 aeb75c0df1 优化推流结束后发送BYE 2024-04-07 20:25:44 +08:00
648540858 7d53009987 优化推流通知 2024-04-07 20:06:48 +08:00
648540858 a1c02605c1 abl-实现closeRtpServer 2024-04-02 14:41:02 +08:00
648540858 86a35f3612 合并开源主线 2024-04-02 11:25:19 +08:00
648540858 1bb813758a Merge branch 'master' into dev/abl支持 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2024-04-02 11:20:51 +08:00
648540858 67688d4a4b 优化停止国标收流 2024-04-02 11:20:19 +08:00
648540858 969ff86ebe 放行abl hook 接口 2024-04-02 09:53:47 +08:00
648540858 8b90fade9e 支持使用abl接收国标流 2024-04-02 00:05:09 +08:00
648540858 b78769f997 临时提交 2024-04-01 18:35:26 +08:00
648540858 33b75be71a 支持abl hook 2024-04-01 18:21:38 +08:00
648540858 4d6f881460 修复空指针异常 2024-04-01 16:20:30 +08:00
648540858 722f1d0ee7 国标级联-修复拉流代理播放 2024-04-01 16:17:01 +08:00
648540858 426ea72d7f 修复拉流代理播放 2024-04-01 15:46:36 +08:00
648540858 73733ab13f 修复推流播放 2024-04-01 15:40:21 +08:00
648540858 fd2ef6effe 修复国标点播 2024-04-01 15:29:49 +08:00
648540858 ecd1d2a414 临时提交 2024-04-01 15:22:45 +08:00
648540858 2738750c3e 移除失效的服务 2024-04-01 09:11:56 +08:00
648540858 5973dcd975 修复点播与录像回放 2024-03-31 00:34:44 +08:00
648540858 4548695a0b hook优化 2024-03-31 00:28:45 +08:00
648540858 0447b83c3a 临时提交 2024-03-29 23:41:00 +08:00
648540858 0324855190 Merge branch 'master' into dev/abl支持 2024-03-29 22:55:09 +08:00
648540858 486daf4dfe 调整看守位控制接口 2024-03-29 19:18:34 +08:00
pei 728e60ce84 处理可能会出现的空指针异常 2024-03-29 11:55:44 +08:00
648540858 7a3b9c6f69 调整hook订阅通知的位置 2024-03-28 19:10:53 +08:00
648540858 cc793d16f5 调整hook订阅通知的位置 2024-03-28 18:35:28 +08:00
648540858 d6df7c8355 Merge branch 'master' into dev/abl支持 2024-03-28 18:13:36 +08:00
648540858 cf3d98102a Merge branch 'master' into 2.7.0 2024-03-28 18:08:57 +08:00
648540858 1de344674a 使用冒号分隔redis的key 2024-03-28 18:08:33 +08:00
648540858 f3ac974036 临时提交 2024-03-28 17:12:31 +08:00
648540858 dae67453c4 Merge branch 'master' into dev/abl支持 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
 2024-03-28 16:50:44 +08:00
648540858 53d4d10e1c Merge branch 'master' into 2.7.0 2024-03-28 16:31:08 +08:00
648540858 f1e902af7f 支持级联移动位置订阅通知转发 2024-03-28 16:28:41 +08:00
648540858 39103e53c7 修复点播请求释放的问题 2024-03-27 18:23:22 +08:00
648540858 7dda1f6a2e Merge branch 'master' into dev/abl支持 2024-03-27 17:18:35 +08:00
648540858 a2b1065fe9 修复redis推流设备推送bug 2024-03-27 16:51:02 +08:00
648540858 0f18d4cbe1 修复redis推流设备推送bug 2024-03-27 16:20:46 +08:00
648540858 e886aa4833 修复PTZType导致声音开关失效的问题 2024-03-27 11:15:35 +08:00
648540858 6de0c329ea 移除多余的节点启动事件分发 2024-03-26 23:38:49 +08:00
648540858 0c2180c07f 支持处理流没找到事件 2024-03-26 23:36:55 +08:00
648540858 f218d7bbd6 支持发送流没找到事件 2024-03-26 23:16:08 +08:00
648540858 1ce30e6656 临时提交 2024-03-26 17:49:56 +08:00
648540858 e2ebe9d6d8 优化流变化逻辑 2024-03-26 11:42:38 +08:00
648540858 cad5f97c2f 优化流变化处理位置 2024-03-26 10:28:08 +08:00
648540858 c6dfb63f8f 优化hook通知 2024-03-25 23:59:50 +08:00
648540858 2b0af3be14 支持hook 2024-03-25 17:59:09 +08:00
648540858 7ce4f44caa 支持设置abl配置中的hook信息 2024-03-25 00:12:32 +08:00
648540858 3e02e496f6 支持设置abl配置信息 2024-03-24 15:51:19 +08:00
648540858 999192fa8a 支持读取abl配置信息 2024-03-23 23:40:32 +08:00
648540858 c1ac16bf62 优化媒体节点服务的代码结构 2024-03-23 15:38:54 +08:00
648540858 23f0aba0ed 修复媒体节点端口初始化失败 2024-03-22 17:48:21 +08:00
648540858 63a35ffaaf 调整节点管理代码结构 2024-03-22 17:44:42 +08:00
648540858 150e7a3199 调整节点管理代码结构 2024-03-22 16:45:18 +08:00
648540858 08696a57d3 Merge branch 'master' into dev/abl支持 2024-03-22 14:28:24 +08:00
648540858 1aa347bd2b zlm hook 优化 2024-03-22 14:28:00 +08:00
648540858 b90dc789b4 优化媒体节点服务的代码结构 2024-03-21 23:39:32 +08:00
648540858 4134c73745 优化Track的构建 2024-03-21 22:38:56 +08:00
648540858 913099291b 临时提交 2024-03-21 18:21:30 +08:00
648540858 f96250ef45 Merge branch 'master' into dev/abl支持 2024-03-21 16:59:14 +08:00
648540858 3291c4b2e6 修复多平台推流无人观看redis通知 2024-03-21 16:54:44 +08:00
648540858 912c83dfd3 添加日志 2024-03-21 11:16:31 +08:00
648540858 c7ca9703c1 优化媒体节点服务的代码结构 2024-03-20 23:50:30 +08:00
648540858 181bf76862 优化节点在线状态 2024-03-20 18:54:39 +08:00
648540858 8ae17764fd 临时提交 2024-03-20 11:07:08 +08:00
leesam 24b4f02a70 [bugfix]读取jwk的Bug修复 2024-03-20 11:05:57 +08:00
648540858 19e10d0d6a 临时提交 2024-03-20 10:33:43 +08:00
648540858 5e3073005d 优化zlm状态管理 2024-03-20 00:26:04 +08:00
648540858 4a0e9945b4 调整节点管理代码结构 2024-03-19 18:47:55 +08:00
648540858 ad32da0dfd 调整节点管理代码结构 2024-03-19 18:29:58 +08:00
648540858 1e0b73b939 调整节点管理代码结构 2024-03-19 17:52:11 +08:00
leesam 76208975bf [add]支持其他平台通过ApiKey调用系统相关接口 2024-03-19 16:53:01 +08:00
648540858 620a4803da 实现部分优化后的接口 2024-03-18 23:56:27 +08:00
648540858 1768565ce0 优化媒体节点服务的代码结构 2024-03-18 23:42:18 +08:00
648540858 97dc926b28 调整ptzType字段名称 2024-03-18 17:41:49 +08:00
648540858 bfafe45b26
Merge pull request #1371 from ancienter/develop 
[bugfix]修复云端录像查询时间转换错误的问题
 2024-03-18 15:39:32 +08:00
648540858 f4e41659d8 修复国标级联注册和心跳重复发送的问题 2024-03-18 10:36:15 +08:00
648540858 c6adfd24d9 修复redis开始推流的通知 2024-03-18 10:13:03 +08:00
648540858 267085e945 修复插入国标设备时字段错误 2024-03-17 22:21:01 +08:00
648540858 4677042b12 Merge remote-tracking branch 'origin/master' 2024-03-16 21:38:28 +08:00
648540858 00fb00a4c3 修复dev配置文件中的logback-spring配置 2024-03-16 21:37:44 +08:00
648540858 045f2334d0 修复级联查看国标录像 2024-03-15 15:15:20 +08:00
leesam 00bb8d914a [bugfix]修复云端录像查询时间转换错误的问题 2024-03-15 09:42:25 +08:00
648540858 debfac58b0 时间解析兼容iso861带毫秒 2024-03-14 16:22:24 +08:00
648540858 d4f6ec39b7 优化CivilCode缓存 2024-03-14 14:54:20 +08:00
648540858 e1c8183adf 调整语音对讲超时任务位置 2024-03-14 11:03:52 +08:00
648540858 d1624e2d06 修复取消移动位置订阅失败的问题 2024-03-13 16:13:05 +08:00
648540858 f7e5fff446 Merge remote-tracking branch 'origin/master' 2024-03-13 15:40:47 +08:00
648540858 dc8869be49 优化收到redis推动的推流设备信息更新内容重复的问题 2024-03-13 15:40:30 +08:00
648540858 e1d476a54a 处理收到redis推动的推流设备信息内容重复的问题 2024-03-13 15:24:09 +08:00
648540858 cb5afce55e 优化语音对讲定时任务的删除 2024-03-12 23:55:00 +08:00
648540858 1fcdf5a8f3 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
 2024-03-08 09:30:48 +08:00
648540858 d8b24fc795 XmlUtil添加直接获取Double和Integer的方法 2024-03-07 14:49:46 +08:00
648540858 5bf87ca330
Merge pull request #1270 from hexq/playback 
Playback
 2024-03-05 10:41:22 +08:00
648540858 bd4598e676 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2024-03-04 14:33:15 +08:00
648540858 38980826f9 修复平台删除时未移除心跳超时重新注册任务的问题 #1329 2024-03-04 14:32:57 +08:00
648540858 5a6044ef4e
Merge pull request #1336 from wendy512/bugfix 
bugfix：修复紫光华智录像查询返回日期为2024-02-21T11:10:36+08:00解析报错，兼容多种不同日期格式
 2024-03-01 14:51:51 +08:00
648540858 a90098b90b Merge branch 'wvp-28181-2.0' into main-dev 2024-03-01 14:46:33 +08:00
648540858 e932a9b824 Merge branch '2.6.9' into wvp-28181-2.0 2024-03-01 10:55:49 +08:00
wendy512 268869c6a1 bugfix：修复紫光华智录像查询返回StartTime、EndTime为2024-02-21T11:10:36+08:00，兼容多种不同日期格式 2024-02-29 21:10:56 +08:00
648540858 c581974027 使用GetMapping替换RequestMapping 2024-02-29 18:15:55 +08:00
648540858 bb94831177 修复访问assist配置https访问失败的问题 2024-02-29 16:20:46 +08:00
648540858 db6f722d20 优化国标级联语音喊话TCP主动模式 2024-02-27 18:02:12 +08:00
648540858 66210ec51a 支持国标级联语音喊话TCP主动模式 2024-02-27 17:41:14 +08:00
648540858 c8b0e66e0e 合并主线 2024-02-27 10:25:42 +08:00
648540858 509d9b3cbb Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
 2024-02-27 10:22:13 +08:00
648540858 5f09692198 添加统一回调管理 2024-02-23 18:48:01 +08:00
648540858 f6c48588da 支持支持主码流子码流切换 2024-02-22 17:22:28 +08:00
648540858 18898e982f 支持读取warning header作为错误消息的内容 #1030 2024-02-20 15:08:06 +08:00
648540858 a9ab5c28e9 优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273 2024-02-20 11:12:42 +08:00
648540858 e5856a9f91 修复ack超时事件异常执行的bug 2024-02-07 21:18:36 +08:00
648540858 f2f70fce98 修复合并错误 2024-02-07 20:53:13 +08:00
648540858 562dbb0857 Merge remote-tracking branch 'origin/main-dev' into main-dev 
# Conflicts:
#	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/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2024-02-07 20:37:23 +08:00
648540858 2e7c9a7341 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	pom.xml
#	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/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/resources/all-application.yml
#	src/main/resources/application-dev.yml
 2024-02-07 20:30:37 +08:00
648540858 b079039f81 修复国标级联上级主动结束时ssrc未释放的问题 2024-02-02 09:20:13 +08:00
648540858 bf0efc2739 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-31 18:50:15 +08:00
648540858 105ad25580 默认设备状态变化发送通知 2024-01-31 18:48:27 +08:00
648540858 fc74ce9de4 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/resources/application-dev.yml
 2024-01-31 17:25:32 +08:00
648540858 68fbc8fef1 优化跨域配置，默认允许全部跨域 2024-01-31 17:23:47 +08:00
PengOu 1245ae7874 Fix 推流列表-> 添加通道 报错： 错误: 字段 "gbStreamId" 不存在 ,改为：gb_stream_id 自测试通过 2024-01-30 10:59:25 +08:00
648540858 ab34cb37f3 修复空指针异常 2024-01-29 21:20:03 +08:00
648540858 695f9b7f4d 修复来自其他wvp的推流时平台名称未赋值的问题 2024-01-29 19:31:07 +08:00
pedoc 3d68b56bb5
修复未配置sipdomain时出现异常 2024-01-29 18:05:17 +08:00
648540858 241d223b8a 添加日志 2024-01-25 17:46:38 +08:00
648540858 b3d21c7452 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-22 16:35:17 +08:00
648540858 a9264a8bc0 修复assist使用https时无法请求的bug 2024-01-22 16:34:58 +08:00
648540858 e8770eec36 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-22 16:02:28 +08:00
648540858 d68aebd409 指定service使用的数据源 2024-01-22 15:56:24 +08:00
648540858 5a3b1c04d6 补充日志 2024-01-22 12:09:04 +08:00
648540858 97a87542a6 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	pom.xml
 2024-01-22 10:37:13 +08:00
648540858 0e94aeaf5f 优化录像合并下载,支持不过滤zlm节点ID 2024-01-22 10:16:16 +08:00
648540858 07729fbe49 优化录像合并下载 2024-01-22 09:46:03 +08:00
648540858 9a89cf81b8 添加多数据源配置实例 2024-01-22 00:33:04 +08:00
648540858 79c8447298 支持使用多数据源 2024-01-22 00:29:09 +08:00
648540858 46af350868 优化多节点国标级联国标录像查询 2024-01-21 22:38:50 +08:00
648540858 31df0fb3ff 修复级联点播时tcp模式信令回复的错误 2024-01-21 16:56:13 +08:00
hexq 7055c53192 BUGFIX：回放时，优先从SDP中提取channelId，兼容从Subject无法提取到channelId的问题 2024-01-20 10:26:49 +08:00
hexq dd4e0d0d9c BUGFIX：向下级目录关联通道时，出现“未查询到目录xxx的信息" 2024-01-20 10:22:34 +08:00
648540858 55b15f8ba6 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-19 17:45:11 +08:00
648540858 cf8a1261b5 支持合并录像使用https 2024-01-19 17:44:31 +08:00
648540858 654599b659 修复通道重命名后无法被检索到 2024-01-19 16:07:30 +08:00
648540858 47e5d2b00b Merge branch '2.6.9' into wvp-28181-2.0 2024-01-19 15:58:50 +08:00
648540858 782e8b9800 修复sendRtpItem写入不及时导致的发流失败 2024-01-19 15:43:08 +08:00
648540858 85f20df9de 修复空指针异常 2024-01-19 15:05:24 +08:00
648540858 47526e241e 修复多wvp推流时，收到停止消息数据处理失败问题 2024-01-19 12:12:35 +08:00
648540858 ebc65b40d3 添加收到invite消息后的日志，减少国标级联推送代理流的等待时间 2024-01-18 14:54:03 +08:00
648540858 7f79b92568 修复设备在事务内注销失败的问题 2024-01-18 10:17:03 +08:00
648540858 88721511e7 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-16 14:51:17 +08:00
648540858 6eed486ff1 合并主线 2024-01-16 14:18:17 +08:00
648540858 9a96597e66 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	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/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
 2024-01-16 14:10:27 +08:00
648540858 c32ba1dea8 修复语音对讲 2024-01-16 11:33:12 +08:00
648540858 9b62fbe467 优化设备编辑页面 2024-01-15 18:36:31 +08:00
648540858 13e2a96dae 添加删除通道时通知的日志 2024-01-15 15:39:28 +08:00
648540858 0371f5a96e 修复国标级联全部添加与全部删除 2024-01-15 15:31:20 +08:00
648540858 674ab18c02 修复rtp暂停检查调用失败 2024-01-12 15:03:11 +08:00
648540858 e5a9dd24ef Merge branch '2.6.9' into wvp-28181-2.0 2024-01-12 14:17:01 +08:00
648540858 18b5c73365 获取InviteInfo添加异常日志 2024-01-12 10:35:26 +08:00
648540858 41c7137e3a
Merge pull request #1242 from criver31/wvp-28181-2.0 
1、修复zlm重连不在线  2、单端口下历史回放暂停和恢复发送的流ID与zlm不一致
 2024-01-12 09:06:10 +08:00
648540858 2b2efb59a6 修复多个推流推送到上级是不完整的问题，修改平台注销时不删除自己模拟的订阅信息 2024-01-11 14:56:11 +08:00
648540858 81a32fdb47 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-10 19:12:06 +08:00
648540858 29f7a6b6eb 修复多wvp模式推流时信息存储错误 2024-01-10 18:55:14 +08:00
648540858 64be28ed77 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-10 16:17:53 +08:00
648540858 c25a99d60b 修复空指针异常 2024-01-10 16:17:29 +08:00
648540858 28e060fd6f 修复空指针异常 2024-01-10 14:42:30 +08:00
648540858 0c10c77a56 优化录像路径的设置 2024-01-10 11:14:49 +08:00
fine db493e2625
修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致 2024-01-09 11:50:26 +08:00
fine 8874c90db2
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2024-01-09 11:45:30 +08:00
648540858 b15e559eae Merge branch '2.6.9' into wvp-28181-2.0 2024-01-08 16:18:28 +08:00
648540858 a74fb6ecd6 优化目录订阅处理，保证存储异常时不影响后续操作 2024-01-08 15:03:07 +08:00
648540858 f3acf33fbf 添加日志 2024-01-05 17:53:20 +08:00
fine b6df13af24
修复zlm重连不在线 2024-01-05 14:14:19 +08:00
648540858 a2cac5ca12 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	pom.xml
 2024-01-04 18:34:46 +08:00
648540858 6120e6bd7b 添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送 2024-01-04 17:26:47 +08:00
648540858 64b6a35603 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-04 11:33:29 +08:00
648540858 d91583b833 修复从redis同步推流列表更新失败 2024-01-04 11:33:08 +08:00
648540858 76e8480cb1 去除多余方法 2023-12-27 16:18:22 +08:00
648540858 b3eb319e05 合并主线 2023-12-26 15:39:04 +08:00
648540858 07b182da98 Merge branch 'wvp-28181-2.0' into feature/record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
 2023-12-26 15:38:40 +08:00
648540858 f8d2b933b1 为每个接口添加调试接口需要的描述 2023-12-26 15:30:24 +08:00
648540858 7c07ae9421 修复文档页面不可用BUG，支持设置认证消息头来方便调用其他接口 2023-12-26 15:03:00 +08:00
xiaoQQya 3ab4ce0a83 perf: 分屏监控设备列表优先使用自定义通道名称 2023-12-26 08:50:41 +08:00
xiaoQQya 9ae520a58a feat(channel): 新增通道支持自定义名称、位置及云台类型 2023-12-19 15:22:09 +08:00
xiaoQQya ef58f29cfc perf(catlog): 优化同步通道时通道名称的处理 
通道名称为空时，默认使用通道编码作为通道名称，避免级联时因通道名称为空导致上级接收通道失败
 2023-12-19 10:07:48 +08:00
648540858 41fdb9d13f Merge branch 'wvp-28181-record' into feature/record 2023-12-18 15:41:39 +08:00
648540858 a380246e49 修复每次注册都会发送状态变化的BUG 2023-12-18 15:27:51 +08:00
648540858 964d55431f 修复推流无声音的问题 2023-12-18 14:43:04 +08:00
648540858 c0b79878f4 合并主线 2023-12-18 14:40:54 +08:00
648540858 67d1ff0d26 Merge branch 'wvp-28181-2.0' into feature/record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-12-18 14:23:48 +08:00
648540858 76d09bcadb 修复sql注入 #1112 2023-12-18 11:14:59 +08:00
648540858 18a9f86a0a
Merge pull request #1209 from DavidSche/fix-1208 
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误
 2023-12-18 09:59:06 +08:00
648540858 7430c98309 增加日志提示 2023-12-17 23:41:21 +08:00
648540858 d8011e9ee7 去除只有udp收流支持ssrc校验的判断 2023-12-17 23:33:18 +08:00
648540858 cb1f1417b6 兼容回复的invite 200OK消息中缺少ssrc(y字段)的情况 2023-12-15 22:44:41 +08:00
648540858 01ecb07a2f Merge branch 'wvp-28181-record' into feature/record 2023-12-15 17:54:56 +08:00
648540858 0a245c4cfe 修复非鉴权接口的跨域失败问题 2023-12-15 17:54:34 +08:00
648540858 df3f5795e7 修复非鉴权接口的跨域失败问题 2023-12-15 17:45:47 +08:00
648540858 3a1fc63d7a 优化ssrc释放逻辑 2023-12-15 17:28:55 +08:00
648540858 2397344973 优化ssrc释放逻辑 2023-12-15 16:44:46 +08:00
648540858 04a1bfa329 优化事务释放逻辑 2023-12-15 16:25:05 +08:00
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 eac72fd06e 优化日志打印样式 2023-12-13 14:37:08 +08:00
648540858 94edd95824
Merge pull request #1205 from xu-bin-bin/wvp-28181-2.0 
修改输出的日志格式
 2023-12-13 14:31:06 +08:00
davidche 572c8850dc
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误 2023-12-13 13:48:04 +08:00
648540858 b4b9ad2873 修复写入事务信息callid错误 2023-12-13 09:40:30 +08:00
xubinbin 42a2772d1a bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195 2023-12-12 17:09:04 +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
xubinbin 5a9621840c 修改控制台输出日志格式，增加显示线程名称，调用类的全类路径以及日子输出行的行号。 2023-12-12 16:37:06 +08:00
648540858 e73d00060e
Merge pull request #1137 from xiaoQQya/develop 
bugfix: 修复推流鉴权、报警推送等问题
 2023-12-11 10:22:26 +08:00
648540858 7a52db4e89
Merge pull request #1138 from shuxiaoyuan/fix-subscribe-catalog 
bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加
 2023-12-11 10:11:36 +08:00
648540858 083523d204
Merge pull request #1188 from lunasaw/wvp-28181-2.0-fix 
fix find stream
 2023-12-11 10:06:35 +08:00
648540858 9f7dc295cf
Merge pull request #1140 from shuxiaoyuan/fix-update-time 
bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错
 2023-12-11 10:05:57 +08:00
648540858 33506a0046
Merge pull request #1146 from leibnewton/fix_on_stream_changed 
修复OnStreamChangedHook媒体轨道信息解析错误
 2023-12-11 10:05:36 +08:00
648540858 bdd1846eb4 优化自动点播判断逻辑 2023-12-06 22:31:26 +08:00
648540858 92e5ed2e30 优化前端云端录像的播放 2023-12-06 16:10:32 +08:00
648540858 7e136c9ac7 完成下载文件的前后调试 2023-12-06 15:11:21 +08:00
648540858 ad36354ef4 优化国标录像服务端，使用zlm新接口实现功能 2023-12-05 11:29:05 +08:00
648540858 fc77b3f819 支持重新接入zlm的时候检查拉流代理数据是否异常，异常数据自动移除 2023-12-01 15:49:18 +08:00
chenzhangyue 0542700225 fix find stream 2023-12-01 10:34:16 +08:00
648540858 67e4060053 添加推流信息专属redis数据 2023-11-30 18:09:43 +08:00
648540858 3d5842e9e2 查询合并文件列表增加app，stream, callId过滤参数 2023-11-28 09:30:49 +08:00
648540858 dbf92b96b0 添加TODO 后续实现删除空了的过期日期文件夹 2023-11-27 14:21:40 +08:00
648540858 ffc8a530f3 修复定时录像删除 2023-11-24 10:47:33 +08:00
648540858 29ef68038d 优化拉流代理中关于ffmpeg.cmd的判断 2023-11-21 14:50:16 +08:00
648540858 db24f49275 定时删除过期录像的时间设置 2023-11-21 14:32:35 +08:00
648540858 c98ef23b98 修复定时删除过期录像文件时，收藏文件被删除的问题 2023-11-21 14:30:33 +08:00
648540858 fc8bb378de Merge branch 'wvp-28181-2.0' into main-dev 2023-11-21 10:50:02 +08:00
648540858 8422d3a343 添加数据库链接参数 2023-11-21 10:49:29 +08:00
dongzhou.xie 9a572b97df 修复OnStreamChangedHook媒体轨道信息解析错误 2023-11-07 11:52:07 +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
xiaoQQya b73747138d
Merge branch '648540858:wvp-28181-2.0' into develop 2023-11-06 15:43:07 +08:00
648540858 c1bc45fe8f 修复点播接口状态判断错误 2023-11-06 15:13:58 +08:00
648540858 a01295603a 简化配置 2023-11-03 17:32:37 +08:00
648540858 58b333604d 修改错别字 2023-11-02 15:30:17 +08:00
648540858 073b6acec3 取出多余注释 2023-11-02 15:25:39 +08:00
648540858 f36eb7ebeb 添加打包文件 2023-11-02 14:17:20 +08:00
lishuyuan 8bd2f47c9a bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错 2023-11-02 10:17:47 +08:00
xiaoQQya f0d09d1808 perf(snap): 优化点播后 ffmpeg 截图使用的命令参数，解决部分情况下截图失败的问题 2023-11-01 17:15:19 +08:00
xiaoQQya 8a9f8c6cab fix: 修复推流鉴权时 enable_audio 设置错误的问题 
推流鉴权获取 ssrc 缓存事务时通过 zlm 回调参数中的 stream 查询，因回调参数中的 stream 为 ssrc，而缓存事务中的 stream 为 deviceId_channelId，故导致查询不到缓存事务信息，进而导致查询不到设备信息无法正确配置 enable_audio 信息，现改为通过 deviceId 与 channelId 查询缓存事务信息
 2023-11-01 16:04:12 +08:00
lishuyuan 5cd2e2c41b bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加 2023-11-01 15:17:28 +08:00
648540858 5d3f307b44 将录像存储路径迁移至wvp中配置，assist以有在需要视频合成的时候才会用 2023-11-01 14:07:32 +08:00
648540858 75fccfaf17 使用zlm原生接口删除录像文件 2023-11-01 10:45:36 +08:00
648540858 6c13317faf Merge branch 'wvp-28181-2.0' into main-dev 2023-10-31 16:24:57 +08:00
648540858 b7ad0a907f 合并pr 优化sql 2023-10-27 18:06:46 +08:00
648540858 829ff200b8 Merge branch 'wvp-28181-2.0' into wvp-28181-record 
# Conflicts:
#	sql/2.6.9更新.sql
 2023-10-27 16:01:07 +08:00
648540858 f4f3e60a6b
Merge pull request #1082 from DavidSche/Live_streaming_push 
推流列表-->添加通道 补充播放需要的默认参数  媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示)
 2023-10-27 15:47:27 +08:00
648540858 af911d4f02
Merge pull request #1102 from xu-bin-bin/wvp-28181-2.0 
修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题
 2023-10-27 15:42:32 +08:00
648540858 47783946fe
Merge pull request #1105 from lunasaw/dev-wvp-1011 
feat:支持代理拉流状态检测，离线查询流是否离线
 2023-10-27 15:41:26 +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 99506108cd 添加日志 2023-10-26 15:29:04 +08:00
648540858 5ff2faa5bd 添加日志 2023-10-25 15:02:15 +08:00
648540858 79f3ca9791 优化收藏功能 2023-10-25 14:45:45 +08:00
xu-bin-bin ae9976bb3a
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-10-24 09:28:16 +08:00
648540858 16c056e338 优化云端录像转化 2023-10-23 17:59:27 +08:00
648540858 daac0010b1 优化云端录像定时清理 2023-10-19 17:52:19 +08:00
648540858 92a25393f3 基于新的云端录像实现页面功能 2023-10-17 17:55:40 +08:00
xiaoQQya 613399cc6d fix(play): 修复单端口推流下级自定义 ssrc 时, 流注册后接口仍然超时的问题 2023-10-17 17:49:31 +08:00
648540858 5a75381a00 基于新的云端录像结构实现国标录像 2023-10-17 15:34:01 +08:00
xu-bin-bin 90d9cd8ac8
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-10-17 09:23:45 +08:00
648540858 7aa8444e67 临时提交 2023-10-13 18:25:36 +08:00
648540858 14d5549876 Merge branch 'wvp-28181-2.0' into main-dev 2023-10-13 15:47:22 +08:00
648540858 4d62f77025 Merge branch 'wvp-28181-2.0' into wvp-28181-record 2023-10-13 15:45:23 +08:00
648540858 12c4128e81 修复目录更新时已删除数据的整理功能 2023-10-13 15:44:49 +08:00
648540858 e4d37864d1 开始重构云端录像继续 2023-10-13 15:26:51 +08:00
xu-bin-bin 124d83fc0c
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-10-13 08:55:27 +08:00
648540858 298a9f4280 开始重构云端录像 2023-10-12 18:34:16 +08:00
648540858 2673fbb0bf Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
 2023-10-12 17:08:59 +08:00
648540858 78f628dd6f 修复同步目录时批量提交的错误 2023-10-12 17:01:25 +08:00
648540858 7d6aaf3bb0 修复国标接连选择通道相关的问题 2023-10-12 16:36:07 +08:00
chenzhangyue f5d89e06a3 feat:支持代理拉流状态检测，离线查询流是否离线 2023-10-11 13:52:08 +08:00
648540858 7443f2b123 修复目录名称修改，修复多层级目录删除，修复全部移除 2023-10-11 02:37:02 +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 e45b443664 测试提交 2023-10-11 01:33:36 +08:00
xubinbin 4084080a8e 修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题。 2023-10-10 15:17:06 +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 94a0de0d27 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-09-30 06:09:57 +08:00