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
..
gb28181	Merge remote-tracking branch 'origin/master' into wvp-28181-2.0	2021-01-05 15:56:19 +08:00
channelList.vue	存储部分使用sqlite代替redis-4	2021-01-05 11:25:05 +08:00
control.vue	改为24小时制显示	2020-11-09 18:42:59 +08:00
Login.vue	修复ui录象播放	2020-10-26 11:40:46 +08:00
ParentPlatformList.vue	[UI] 完成国标级联的CURD	2020-11-23 18:17:20 +08:00
platformEdit.vue	新建上级级联平台时自动填入本级平台参数	2020-12-17 14:50:49 +08:00
UiHeader.vue	补充漏掉的文件	2020-12-21 16:01:47 +08:00
videoList.vue	优化录像查询，优化注释	2021-01-05 14:35:43 +08:00