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

2060 Commits (f89933fb58dbf947181917fe9ec289f28ddc0d44)

Author SHA1 Message Date
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