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
..
offline	删除多余行	2020-10-19 20:31:53 +08:00
online	与master分支同步	2020-12-16 20:29:19 +08:00
platformNotRegister	完成向上级联->注册	2020-11-24 16:41:00 +08:00
DeviceOffLineDetector.java	改名	2020-07-16 16:10:49 +08:00
EventPublisher.java	完成向上级联->注册	2020-11-24 16:41:00 +08:00
SipSubscribe.java	存储部分使用sqlite代替redis	2020-12-31 13:15:50 +08:00