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 ad5b66eb71 临时提交 2024-09-04 18:01:54 +08:00
648540858 9a0f1512c9 临时提交 2024-09-04 10:49:34 +08:00
648540858 4597fb197d 临时提交 2024-09-04 10:30:26 +08:00
648540858 fa47f619ba 临时提交 2024-09-03 18:00:35 +08:00
648540858 de0ad2b32e 修复国标级联点播通道编号重复异常 2024-08-29 18:04:16 +08:00
648540858 0416b76ed0 国标级联支持搜索 2024-08-29 17:18:22 +08:00
648540858 8dc27d1353 国标级联通道共享支持自定义通道编号和名称 2024-08-29 16:47:46 +08:00
648540858 e55cd08b08 国标级联通道共享支持按照设备添加共享和移除共享 2024-08-29 11:08:42 +08:00
648540858 1efb5fca0f 临时提交 2024-08-28 18:00:42 +08:00
648540858 ddf917d127 临时提交 2024-08-28 17:10:53 +08:00
648540858 64e9b6674f 修复通道共享的BUG以及增加通道手动推送的功能 2024-08-28 16:04:48 +08:00
648540858 dd794d4868 临时提交 2024-08-27 17:56:49 +08:00
648540858 c45bf5d6af 国标级联通道共享重构完善 2024-08-26 17:16:04 +08:00
648540858 5216e9723c 临时提交 2024-08-24 21:54:59 +08:00
648540858 5a259aaa63 临时提交 2024-08-24 00:18:54 +08:00
648540858 d2654660cb 临时提交 2024-08-23 17:50:29 +08:00
648540858 5169eb66a3 临时提交 2024-08-23 11:25:45 +08:00
648540858 0722aa3aeb 临时提交 2024-08-22 18:05:57 +08:00
648540858 6fcf05e04b 临时提交 2024-08-21 17:59:58 +08:00
648540858 a18fba8495 临时提交 2024-08-21 17:40:01 +08:00
648540858 88abf36d6f 临时提交 2024-08-18 23:01:02 +08:00
648540858 160a5d84c3 修复目录推送的BUG 2024-08-17 22:49:40 +08:00
648540858 9247c7e805 完善国标级联点播推流，拉流代理，国标 2024-08-17 22:31:13 +08:00
648540858 20f93d52d7 临时提交 2024-08-17 20:49:07 +08:00
panlinlin 4dd656b29b 完善目录推送 2024-08-17 08:02:39 +08:00
panlinlin 635458d19a 临时提交 2024-08-17 07:01:40 +08:00
648540858 aeb3cd6a22 临时提交 2024-08-16 17:59:53 +08:00
648540858 326025ee85 完成通道共享 2024-08-16 16:23:54 +08:00
panlinlin 976c089b7f 临时提交 2024-08-15 23:45:00 +08:00
648540858 abed3ecbec 临时提交 2024-08-15 17:45:24 +08:00
panlinlin 1cbd8d677c 临时提交 2024-08-15 00:03:53 +08:00
648540858 cce1d1de40 重构INVITE消息处理中的上级点播请求 2024-08-14 17:19:19 +08:00
648540858 d5621f9489 临时提交 2024-08-13 18:03:34 +08:00
648540858 ad240ba9a4 优化国标级联点播逻辑 2024-08-13 17:57:25 +08:00
648540858 213b218efa 临时提交 2024-08-12 18:00:06 +08:00
648540858 9a4a81a90e 临时提交 2024-08-12 15:30:01 +08:00
648540858 5ff232150d Merge remote-tracking branch 'origin/dev/master-通道结构重构' into dev/master-通道结构重构 2024-08-12 09:55:10 +08:00
648540858 bfa2c1b2e8 临时提交 2024-08-12 09:54:50 +08:00
panlinlin 0177831e86 临时提交 2024-08-11 23:20:42 +08:00
panlinlin 76a0d248ef 临时提交 2024-08-10 23:27:21 +08:00
648540858 baeffa4311
Merge pull request #1559 from koisi-io/fix 
[bugfix]修复前面几次合并所遗漏的一些问题
 2024-08-10 20:59:52 +08:00
648540858 2464052add
Merge pull request #1565 from mylvlin/master 
修复在ORACLE,达梦等数据库下的用户查询BUG
 2024-08-10 20:59:27 +08:00
648540858 d8d9f76d89 支持多WVP的推流播放 2024-08-09 17:55:39 +08:00
648540858 16708e385b 支持多WVP的推流播放 2024-08-09 16:27:08 +08:00
648540858 7f8a15f017 优化收到目录时的分组信息处理 2024-08-09 11:08:40 +08:00
panlinlin a1671c3c3e 临时提交 2024-08-08 23:44:03 +08:00
648540858 8ab88c0f02 临时提交 2024-08-08 22:43:37 +08:00
648540858 9aad6ac719 临时提交 2024-08-08 17:47:08 +08:00
panlinlin 3e220a2c1e 临时提交 2024-08-07 23:45:29 +08:00
648540858 5abf5012eb 完善分组通道管理 2024-08-07 17:12:39 +08:00
648540858 a3f7753b84 Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	web_src/src/components/PushVideoList.vue
 2024-08-07 11:17:34 +08:00
648540858 c88681c7ad 合并分支 2024-08-07 10:41:54 +08:00
648540858 d97accee4a 临时提交 2024-08-06 16:55:33 +08:00
linshunhua 402ffa0b1e 修复在ORACLE,达梦等数据库下的用户查询BUG 2024-08-06 16:52:22 +08:00
koisi 5772d3f231
修复 87c071:合并271分支 的参数遗漏 
将推流信息记录至redis，由StreamPushItem变更成OnStreamChangedHookParam时，漏了设置serverId。
 2024-08-05 18:59:02 +08:00
648540858 ce0f0c4ac8 临时提交 2024-08-05 17:59:20 +08:00
koisi c1a8e62f23
修复6月25日合并271时，变量类型未同步更新的问题 
处理ZLM推拉流事件的参数由StreamPushItem变更成OnStreamChangedHookParam了，然后有个地方没有同步更新。
 2024-08-05 17:04:58 +08:00
panlinlin 96bbd19e81 临时提交 2024-08-05 08:00:16 +08:00
panlinlin 18c51919a3 临时提交 2024-08-02 23:47:44 +08:00
648540858 91b8e7a595 临时提交 2024-08-02 17:48:32 +08:00
648540858 55c534ac90 临时提交 2024-08-02 14:46:20 +08:00
648540858 3f2c9f6451 临时提交 2024-08-01 17:50:34 +08:00
648540858 f7c98301ac 临时提交 2024-08-01 15:29:51 +08:00
Iwan Lebron c7c94ee73d
修复 ZLMServerFactory 日志不打印 2024-08-01 14:47:43 +08:00
648540858 7ee3cdb801 完善行政区划管理 2024-07-31 15:07:54 +08:00
648540858 3ce973d2ee 临时提交 2024-07-30 17:58:18 +08:00
648540858 112cb2dfd8 临时提交 2024-07-29 17:44:34 +08:00
panlinlin e285257f24 临时提交 2024-07-28 07:36:20 +08:00
648540858 8169983f21 临时提交 2024-07-28 06:19:18 +08:00
648540858 b246fd6a20 临时提交 2024-07-26 17:53:10 +08:00
648540858 a2b00a4f4e 临时提交 2024-07-25 18:02:22 +08:00
648540858 5a812e7f08 临时提交 2024-07-24 17:54:19 +08:00
648540858 6bd0cdd37b 临时提交 2024-07-23 18:00:47 +08:00
648540858 05fabc87a2 临时提交 2024-07-22 18:00:01 +08:00
648540858 ff5ba1698a Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2024-07-22 14:29:54 +08:00
648540858 b7d671e6d9 优化录像下载流程 2024-07-22 14:21:23 +08:00
648540858 c96c29776d 临时提交 2024-07-22 14:20:40 +08:00
648540858 2f4d983f9f 修复拉流看方式回显 2024-07-22 11:07:58 +08:00
panlinlin 0b7d55ed74 修复拉流代理相关问题 2024-07-20 23:31:38 +08:00
panlinlin 80ac701748 临时提交 2024-07-20 06:44:53 +08:00
panlinlin d201be2f88 修复设备初次注册无通道 2024-07-20 06:35:42 +08:00
panlinlin 1dc0cb0c83 临时提交 2024-07-19 20:29:10 +08:00
648540858 9f4e66a38b 优化拉流代理 2024-07-19 17:54:14 +08:00
648540858 78088ba53f 临时提交 2024-07-18 18:00:45 +08:00
648540858 4e6f7f8385
Merge pull request #1533 from wendy512/bugfix 
解决国标视频回放判断streamMode时空指针异常问题
 2024-07-18 14:09:15 +08:00
648540858 f331b0b0d3
Merge pull request #1524 from ZhaoYandong00/master 
修复在docker中使用，平台信息IP无法显示主机IP的问题
 2024-07-18 14:08:05 +08:00
wendy512 7732a1d180 解决国标视频回放判断streamMode时空指针异常问题 2024-07-18 13:40:47 +08:00
648540858 e46ad4e66a 临时提交 2024-07-17 17:56:26 +08:00
648540858 8c95485504 修复推流信息播放 2024-07-16 17:44:27 +08:00
648540858 d7abe7fb75 适配推流列表信息 2024-07-16 17:33:18 +08:00
648540858 90d298f7a7 临时提交 2024-07-15 17:59:41 +08:00
648540858 1dcb912910 调整推流导入的数据格式 2024-07-15 17:52:27 +08:00
648540858 d9c0d0637c 增加通道编辑以及通道重置功能 2024-07-15 17:39:47 +08:00
648540858 9d37e96f06 修复空指针异常 2024-07-15 16:30:21 +08:00
648540858 cb403689b4 添加通道编号构建页面 2024-07-12 17:52:05 +08:00
panlinlin 0853d7e842 临时提交 2024-07-11 23:52:34 +08:00
648540858 6619c5c53d 临时提交 2024-07-11 18:25:16 +08:00
648540858 a084fac7cd 优化通道数据显示 2024-07-10 17:33:04 +08:00
648540858 6ecf8af6ca 优化通道数据异常时的入库逻辑 2024-07-10 15:58:26 +08:00
648540858 b843958ed7 临时提交 2024-07-10 14:43:22 +08:00
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