panlinlin
|
4ed02aa69b
|
完成向上级联->删除的时候注销
|
2021-01-07 13:15:39 +08:00 |
|
panlinlin
|
a8a36efb93
|
完成向上级联->保活
|
2021-01-06 18:35:38 +08:00 |
|
panlinlin
|
20669ed768
|
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
|
2ab8b942bd
|
存储部分使用sqlite代替redis
|
2020-12-31 13:15:50 +08:00 |
|
panlinlin
|
e4d849304c
|
增加对水星IPC的兼容
增加对SIP错误的订阅，刷新通道或点播或回放出现sip错误时及时返回给页面
优化UI，增加按钮loading
|
2020-12-26 16:44:27 +08:00 |
|
Lawrence
|
7b5fe25b96
|
与master分支同步
|
2020-12-16 20:29:19 +08:00 |
|
648540858
|
2bfef8ab6c
|
修改错误注释和错误日志
|
2020-12-14 15:11:48 +08:00 |
|
648540858
|
a96d22701e
|
完成向上级联->注册
|
2020-11-24 16:41:00 +08:00 |
|
Lawrence
|
7868486e37
|
删除多余行
|
2020-10-19 20:31:53 +08:00 |
|
648540858
|
dec1038f7b
|
修改bug
|
2020-10-15 15:23:41 +08:00 |
|
swwheihei
|
9e6f795ecc
|
改名
|
2020-07-16 16:10:49 +08:00 |
|
songww
|
44790f4b79
|
尝试修复catalog获取失败。服务重启后设备未注册仍上报keeplive处理
|
2020-05-13 14:55:06 +08:00 |
|
songww
|
70091f29f2
|
初始提交
|
2020-05-07 21:55:45 +08:00 |
|