Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

.gitignore

@@ -9,7 +9,7 @@
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
-
+src/main/resources/application-*.yml
 # Package Files #
 #*.jar
 *.war
@@ -18,7 +18,7 @@
 *.zip
 *.tar.gz
 *.rar
-
+*.iml
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /.idea/*

src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java

@@ -121,7 +121,9 @@ public class SipLayer implements SipListener {
 		logger.debug(evt.getRequest().toString());
 		// 由于jainsip是单线程程序，为提高性能并发处理
 		processThreadPool.execute(() -> {
+			if (processorFactory != null) {
 				processorFactory.createRequestProcessor(evt).process();
+			}
 		});
 	}
 

src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@@ -119,7 +119,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 	@Override
 	public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) {
 		// 获取到所有正在播放的流
-		PageHelper.startPage(page, count);
+		PageHelper.startPage(page+1, count);
 		List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online);
 		return new PageInfo<>(all);
 	}
@@ -131,7 +131,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 
 	@Override
 	public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) {
-		PageHelper.startPage(page, count);
+		PageHelper.startPage(page+1, count);
 		List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null);
 		return new PageInfo<>(all);
 	}
@@ -151,7 +151,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 	 */
 	@Override
 	public PageInfo<Device> queryVideoDeviceList(int page, int count) {
-		PageHelper.startPage(page, count);
+		PageHelper.startPage(page+1, count);
 		List<Device> all = deviceMapper.getDevices();
 		return new PageInfo<>(all);
 	}

web_src/src/components/channelList.vue

@@ -108,7 +108,7 @@ export default {
     mounted() {
         this.initData();
         if (this.autoList) {
-            this.updateLooper = setInterval(this.initData, 1500);
+            this.updateLooper = setInterval(this.initData, 5000);
         }
         
     },