Commit Graph

13 Commits (41ca4e938d63027931447ebe343f47366194cac2)

Author SHA1 Message Date
panlinlin b17280522b 增加推流转发到国标,尚不完善 2021-04-02 19:04:01 +08:00
panlinlin 7dc8fd4a1e 添加拉流代理与国标关联, 支持代理rtsp/rtmp/...,转发到国标 2021-04-01 18:06:21 +08:00
panlinlin 56859d09df 添加推流列表和拉流代理,下一步与国标关联 2021-03-30 18:46:34 +08:00
panlinlin edb033ccd7 添加获取直播流的api 2021-03-26 18:32:36 +08:00
panlinlin 9a4b0de1af 重命名设备管理组件 2021-03-25 17:48:20 +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
Lawrence 9571eb3a15 增加移动位置显示功能 2021-01-27 15:24:28 +08:00
Lawrence fc4cd01f67 修改本地jar库路径描述,避免marven编译Warning 2021-01-09 14:58:08 +08:00
panlinlin 627a14f37e 完成向上级联->保活 2021-01-06 18:35:38 +08:00
Lawrence 44d216100b 与master分支同步 2020-12-16 20:29:19 +08:00
648540858 14003b9805 [UI] 完成国标级联的CURD 2020-11-23 18:17:20 +08:00
648540858 1904978856 添加addParentPlatform, queryParentPlatformList 接口 2020-11-20 18:02:01 +08:00
648540858 be42a35eca 修复子节点显示错误 2020-10-12 10:11:24 +08:00