aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-23 05:37:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
783 Commits 27 Branches 1 Tag 209 MiB
59e3a280d6
Commit Graph

55 Commits

Author SHA1 Message Date
648540858
59e3a280d6 去除目录通知多余的信息 2022-01-17 17:42:09 +08:00
648540858
fa346513db 优化级联选择通道页面添加方式 2022-01-17 16:46:28 +08:00
648540858
385fdb95f1 优化级联选择通道逻辑 2022-01-17 15:48:08 +08:00
648540858
06e22d980e 支持推流通道预导入 2022-01-16 10:40:57 +08:00
648540858
ac1a4a027a 支持国标级联的目录订阅功能 2022-01-14 17:04:26 +08:00
lin
ddb36e54bd 级联平台添加GPS订阅支持 2022-01-08 16:47:20 +08:00
648540858
6e0f7fae6e 为级联平台增加虚拟目录功能 2022-01-05 15:23:14 +08:00
648540858
7e428f8231 修复redis配置功能在redis配置了 notify-keyspace-events时无法强制配置的问题 2022-01-04 19:40:01 +08:00
648540858
89956873d7 redis 增加配置控制是否调用config命令 2021-12-20 15:14:34 +08:00
648540858
344692640c 修复zlm离线时误报设备离线 2021-12-20 10:19:05 +08:00
648540858
2166ec9362 解决Redis服务出于安全会禁用CONFIG命令后服务不可用的问题 2021-12-08 20:56:07 +08:00
648540858
ab81136765 优化适配zlm的hook保活 2021-12-08 16:45:50 +08:00
648540858
9b1af8ef13 适配zlm的hook保活 2021-12-07 21:13:55 +08:00
648540858
241804f5f8 优化redis存储，alarm默认关闭处理 2021-12-03 16:13:46 +08:00
648540858
c23932eb00 #221 2021-11-17 22:58:41 +08:00
648540858
874b37ef35 修复级联注册消息回复的空指针异常 2021-11-16 23:22:57 +08:00
648540858
3745c80567 重构28181信令的message结构 2021-11-09 11:56:21 +08:00
648540858
f1217682a9 重构28181信令结构，解决循环依赖导致的无法直接注入 2021-11-05 18:27:41 +08:00
648540858
c33bf822cc 修复级联的通道查询以及设备信息查询 2021-11-04 15:56:24 +08:00
648540858
31e340e8e2 修改云台控制接口使其更加直观 2021-11-03 14:58:48 +08:00
648540858
b445128fb5 修复订阅清理请示任务的执行时长 2021-11-03 10:30:42 +08:00
648540858
61fc5b656a 修复错误的类型判断导致的过期事件无法监听 2021-11-02 16:59:22 +08:00
648540858
bb226c431e 修复订阅sip消息导致的内存溢出以及录像回放的问题 2021-11-02 16:50:22 +08:00
648540858
96bc081ea9 添加用户操作接口 2021-08-05 12:35:54 +08:00
64850858
3469271ec2 优化集群方案， 每个zlm一套ssrc； 
优化集群下的docker接入逻辑；
更正sql脚本；
支持重启不设置设备离线。重启SIP事务不丢失
 2021-07-26 11:40:32 +08:00
64850858
89a9ab4534 添加zlm集群支持 2021-07-16 16:34:51 +08:00
64850858
4c4b62cb3a 支持设置级联注册失败时再次注册的时间 2021-06-08 15:49:40 +08:00
64850858
83411ad127 设备信息增加最近注册时间和最近心跳时间，心跳超时时间变为可配置 2021-06-07 15:11:53 +08:00
64850858
ad93be12fb 添加云端录像功能 2021-06-01 17:05:07 +08:00
panlinlin
10ae1bba59 增加对zlm使用docker容器的支持 2021-04-28 15:10:35 +08:00
panlinlin
bf8fb0c51f 添加级联平台自动注册时失败自动重新注册 2021-04-27 15:35:22 +08:00
panlinlin
39078225f1 优化级联时的异常处理 2021-04-26 18:38:57 +08:00
panlinlin
f7a2d2a92d 去除所有的system.print, 优化日志显示 2021-04-26 11:37:54 +08:00
panlinlin
937e591430 解决串流，解决编辑上级平台却新建了的问题 2021-04-15 17:48:52 +08:00
lawrencehj
b01ec1d727 修正平台Keepalive错误 2021-03-10 14:37:17 +08:00
lawrencehj
b7857027d5 去除冗余代码和死代码 2021-03-09 20:02:56 +08:00
panlinlin
0f58218bad Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 
# Conflicts:
#	README.md
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
#	src/main/resources/wvp.sqlite
#	web_src/.postcssrc.js
#	web_src/src/components/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js
 2021-02-25 18:10:02 +08:00
lawrencehj
a8603075d4 去除冗余代码，修正编译报警项 2021-02-05 15:15:39 +08:00
Lawrence
e4918d29f3 添加浏览器ID，确保SSE可同时推送到不同的前端 2021-01-21 20:58:11 +08:00
Lawrence
4b9549dfbf 添加浏览器ID，确保SSE可同时推送到不同的前端 2021-01-21 19:57:57 +08:00
Lawrence
abbfef2aef 添加报警响应、发布和SSE推送功能 2021-01-20 23:31:00 +08:00
Lawrence
6811b8dc5c 增加设备报警事件响应、发布和信息处理 2021-01-20 20:39:57 +08:00
panlinlin
54d7953179 完成向上级联->删除的时候注销 2021-01-07 13:15:39 +08:00
panlinlin
627a14f37e 完成向上级联->保活 2021-01-06 18:35:38 +08:00
panlinlin
34135cce5d Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 
# Conflicts:
#	README.md
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
#	src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
#	src/main/resources/application-dev.yml
#	web_src/src/components/gb28181/devicePlayer.vue
 2021-01-05 15:56:19 +08:00
panlinlin
3d83775468 存储部分使用sqlite代替redis 2020-12-31 13:15:50 +08:00
panlinlin
f2279859b3 增加对水星IPC的兼容 
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
 2020-12-26 16:44:27 +08:00
Lawrence
44d216100b 与master分支同步 2020-12-16 20:29:19 +08:00
648540858
285f08fc3b 修改错误注释和错误日志 2020-12-14 15:11:48 +08:00
648540858
ecaf8750dd 完成向上级联->注册 2020-11-24 16:41:00 +08:00